diff --git a/arch/mips/Kbuild b/arch/mips/Kbuild
new file mode 100644
index 0000000000000000000000000000000000000000..a18eb5d4d40e7521d1aea63c0c8fb42402b77608
--- /dev/null
+++ b/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/arch/mips/Makefile b/arch/mips/Makefile
index 0b9c01add0a06d91b49ff813f8eb127c70ae112a..d39be4708289fe918f5069884d9434116545e5d6 100644
--- a/arch/mips/Makefile
+++ b/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/