diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile
index 673b1b5b89..56c54ef4bd 100644
--- a/target/linux/octeon/Makefile
+++ b/target/linux/octeon/Makefile
@@ -10,7 +10,7 @@ ARCH:=mips
 BOARD:=octeon
 BOARDNAME:=Cavium Networks Octeon
 FEATURES:=squashfs jffs2 pci
-CFLAGS:=-Os -pipe -funit-at-a-time
+CFLAGS:=-Os -pipe -mtune=octeon -funit-at-a-time
 
 LINUX_VERSION:=2.6.30.7
 
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index de0bbafbc8..873dbfcdc2 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -10,6 +10,7 @@ choice
 	default GCC_VERSION_4_3_3 if TARGET_etrax
 	default GCC_VERSION_4_3_3 if TARGET_coldfire
 	default GCC_VERSION_4_4_0 if ubicom32
+	default GCC_VERSION_4_4_1 if TARGET_octeon
 	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 c99b14c27e..3f7b65715a 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -58,4 +58,7 @@ if !TOOLCHAINOPTS
 
 	config GCC_VERSION_4_4_0
 		default y if ubicom32
+
+	config GCC_VERSION_4_4_1
+		default y if TARGET_octeon
 endif