diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 55ab7e5548..e5ee5bd574 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,8 +2,8 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_1_1 if LINUX_2_6_ARUBA
-	default GCC_VERSION_3_4_6
+	default GCC_VERSION_4_1_1
+	default GCC_VERSION_3_4_6 if LINUX_2_4
 	help
 	  Select the version of gcc you wish to use.
 
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 397dfa4986..495c883c7f 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -9,14 +9,14 @@ config GCC_VERSION
 	default "4.1.1"     if GCC_VERSION_4_1_1
 	default "4.2"		if GCC_VERSION_4_2
 	default "3.4.6-nonmips"	    if GCC_VERSION_3_4_6_nonmips
-	default "3.4.6"
+	default "4.1.1"
 
 if !TOOLCHAINOPTS
 	config GCC_VERSION_4_2
 		default n
 
-	config GCC_VERSION_4_1_1
-		default y if LINUX_2_6_ARUBA || LINUX_2_6_IXP4XX || LINUX_2_6_RB532 || LINUX_2_6_X86
+	config GCC_VERSION_3_4_6
+		default y if LINUX_2_4
 endif