diff --git a/[refs] b/[refs]
index 8daa21214fa8..bda31f68de4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78e6f4c03d51e4004866918a1482d48624e38d67
+refs/heads/master: 9aeb404b4cfed41fdfd01e6fb3cc995c327ba98e
diff --git a/trunk/arch/mips/Kbuild b/trunk/arch/mips/Kbuild
new file mode 100644
index 000000000000..a18eb5d4d40e
--- /dev/null
+++ b/trunk/arch/mips/Kbuild
@@ -0,0 +1,6 @@
+# mips object files
+# The object files are linked as core-y files would be linked
+
+obj-y += kernel/
+obj-y += mm/
+obj-y += math-emu/
diff --git a/trunk/arch/mips/Makefile b/trunk/arch/mips/Makefile
index 0b9c01add0a0..d39be4708289 100644
--- a/trunk/arch/mips/Makefile
+++ b/trunk/arch/mips/Makefile
@@ -706,7 +706,8 @@ head-y := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
 
 libs-y			+= arch/mips/lib/
 
-core-y			+= arch/mips/kernel/ arch/mips/mm/ arch/mips/math-emu/
+# See arch/mips/Kbuild for content of core part of the kernel
+core-y += arch/mips/
 
 drivers-$(CONFIG_OPROFILE)	+= arch/mips/oprofile/