diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 03f7eddc84..01557138d5 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -4,6 +4,7 @@ choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
 	default GCC_VERSION_3_4_6 if LINUX_2_4
 	default GCC_VERSION_4_2_0 if TARGET_magicbox
+	default GCC_VERSION_4_2_3 if TARGET_avr32
 	default GCC_VERSION_4_1_2
 	help
 	  Select the version of gcc you wish to use.
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 66fb8713ae..b9ef848330 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -14,6 +14,9 @@ if !TOOLCHAINOPTS
 
 	config GCC_VERSION_4_2_0
 		default y if TARGET_magicbox
+
+	config GCC_VERSION_4_2_3
+		default y if TARGET_avr32
 endif