diff --git a/debian/changelog b/debian/changelog
index fec94949f..f7fd59729 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ linux (4.6-1~exp2) UNRELEASED; urgency=medium
 
   [ Aurelien Jarno ]
   * [mips64el] Set CPU to MIPS64 R2.
+  * [mips] Set CPU to MIPS32/64 R2.
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 17 May 2016 23:33:30 +0100
 
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
new file mode 100644
index 000000000..f84e39971
--- /dev/null
+++ b/debian/config/mips/config.4kc-malta
@@ -0,0 +1,7 @@
+##
+## file: arch/mips/Kconfig
+##
+## choice: CPU type
+# CONFIG_CPU_MIPS32_R1 is not set
+CONFIG_CPU_MIPS32_R2=y
+## end choice
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta
new file mode 100644
index 000000000..6de397451
--- /dev/null
+++ b/debian/config/mips/config.5kc-malta
@@ -0,0 +1,7 @@
+##
+## file: arch/mips/Kconfig
+##
+## choice: CPU type
+# CONFIG_CPU_MIPS64_R1 is not set
+CONFIG_CPU_MIPS64_R2=y
+## end choice
diff --git a/debian/config/mips/defines b/debian/config/mips/defines
index 55e0fb7bb..a86dd0318 100644
--- a/debian/config/mips/defines
+++ b/debian/config/mips/defines
@@ -18,14 +18,14 @@ hardware: MIPS Malta
 hardware-long: MIPS Malta boards
 
 [4kc-malta_image]
-configs: kernelarch-mips/config.4kc-malta
+configs: kernelarch-mips/config.4kc-malta mips/config.4kc-malta
 
 [5kc-malta_description]
 hardware: MIPS Malta (64-bit)
 hardware-long: MIPS Malta boards (64-bit)
 
 [5kc-malta_image]
-configs: kernelarch-mips/config.5kc-malta
+configs: kernelarch-mips/config.5kc-malta mips/config.5kc-malta
 
 [octeon_description]
 hardware: Octeon