diff --git a/debian/changelog b/debian/changelog
index 0c0e35c19..9e925dc1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ linux (4.5-1~exp2) UNRELEASED; urgency=medium
   * [mips*/octeon] Enable SPI_OCTEON.
   * [mips*/octeon] udeb: Add ahci_octeon and ahci_platform modules to
     sata-modules.
+  * [mips*/octeon] Bump CONFIG_NR_CPUS to 32 to accomodate recent Octeon
+    III SoCs.
 
  -- Ben Hutchings <ben@decadent.org.uk>  Fri, 25 Mar 2016 13:43:57 +0000
 
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index 69997e31e..4ecbb6c2b 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -13,6 +13,7 @@ CONFIG_SMP=y
 CONFIG_PCI=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
+CONFIG_NR_CPUS=32
 
 ##
 ## file: arch/mips/cavium-octeon/Kconfig