diff --git a/avr-gcc/distinfo b/avr-gcc/distinfo
index e86272dba1b..46f06bd2ef8 100644
--- a/avr-gcc/distinfo
+++ b/avr-gcc/distinfo
@@ -3,6 +3,6 @@ $NetBSD$
 BLAKE2s (gcc-12.1.0.tar.xz) = 286450a2355504683b6ce4e027ea609e790b83868fed0bfbc89041673ae02e0c
 SHA512 (gcc-12.1.0.tar.xz) = 2121d295292814a6761edf1fba08c5f633ebe16f52b80e7b73a91050e71e1d2ed98bf17eebad263e191879561c02b48906c53faa4c4670c486a26fc75df23900
 Size (gcc-12.1.0.tar.xz) = 82701928 bytes
-SHA1 (patch-gcc_config_nvptx_gen-opt.sh) = 8e1b04c8f6bed93fc91fb61b6f5ff576d71e2ad0
-SHA1 (patch-gcc_configure) = c5bc266fb394d935528685c1b77b2d2a266afb27
+SHA1 (patch-gcc_config_nvptx_gen-opt.sh) = e57ddb20c40929328bbc4da696d60403925cb99d
+SHA1 (patch-gcc_configure) = 8ad5b9244b1ae974b1399c7b65ea6fca5b11f302
 SHA1 (patch-libgcc_libgcov.h) = 1fe3a2b55bac15ea1332040462675755945f5b05
diff --git a/avr-gcc/patches/patch-gcc_config_nvptx_gen-opt.sh b/avr-gcc/patches/patch-gcc_config_nvptx_gen-opt.sh
index af5ed54706a..3e30561c853 100644
--- a/avr-gcc/patches/patch-gcc_config_nvptx_gen-opt.sh
+++ b/avr-gcc/patches/patch-gcc_config_nvptx_gen-opt.sh
@@ -1,6 +1,7 @@
 $NetBSD$
 
 Fix nonportable syntax in "[" command.
+<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105831>
 
 --- gcc/config/nvptx/gen-opt.sh.orig	2022-05-06 07:30:57.000000000 +0000
 +++ gcc/config/nvptx/gen-opt.sh
diff --git a/avr-gcc/patches/patch-gcc_configure b/avr-gcc/patches/patch-gcc_configure
index c92009b3690..fa4d9ae3dd9 100644
--- a/avr-gcc/patches/patch-gcc_configure
+++ b/avr-gcc/patches/patch-gcc_configure
@@ -1,6 +1,7 @@
 $NetBSD$
 
 Fix nonportable syntax in "test" command.
+<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105831>
 
 --- gcc/configure.orig	2022-05-06 07:30:57.000000000 +0000
 +++ gcc/configure