diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 18899c9d0f..4012dfddfd 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -8,10 +8,10 @@ choice
 	default GCC_VERSION_4_3_3 if TARGET_etrax
 	default GCC_VERSION_4_3_3 if TARGET_coldfire
 	default GCC_VERSION_4_4_1 if ubicom32
-	default GCC_VERSION_4_4_1 if TARGET_octeon
-	default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !TARGET_octeon
+	default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
 	default GCC_VERSION_4_3_3_CS if (arm || armeb) && !TARGET_gemini
 	default GCC_VERSION_4_4_3 if powerpc
+	default GCC_VERSION_4_4_3 if (TARGET_octeon || TARGET_sibyte)
 	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 583f190595..ad133680cc 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -70,15 +70,15 @@ if !LINUX_2_4
 		default y if TARGET_coldfire
 
 	config GCC_VERSION_4_3_3_CS
-		default y if (mips || mipsel) && !TARGET_octeon
+		default y if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
 		default y if (arm || armeb) && !TARGET_gemini
 
 	config GCC_VERSION_4_4_1
 		default y if ubicom32
-		default y if TARGET_octeon
 
 	config GCC_VERSION_4_4_3
 		default y if powerpc
+		default y if (TARGET_octeon || TARGET_sibyte)
 
 endif
 endif