diff --git a/debian/changelog b/debian/changelog
index 47463c7ac..c9d5826b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ linux (4.2.1-3) UNRELEASED; urgency=medium
   * i2c: Enable I2C_CHARDEV as a module in all configurations with I2C
     support (Closes: #800597)
   * [mips*/octeon] Enable CAVIUM_CN63XXP1 (Closes: #800595)
+  * [mips*/octeon] Enable MMC, MMC_BLOCK, OCTEON_MMC and other drivers as
+    modules (Closes: #800594)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 03 Oct 2015 00:14:59 +0100
 
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index 3c80294f3..5a226acb0 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -77,6 +77,16 @@ CONFIG_INPUT_MOUSE=y
 CONFIG_FUSION=y
 CONFIG_FUSION_SAS=y
 
+##
+## file: drivers/mmc/Kconfig
+##
+CONFIG_MMC=m
+
+##
+## file: drivers/mmc/card/Kconfig
+##
+CONFIG_MMC_BLOCK=m
+
 ##
 ## file: drivers/mtd/Kconfig
 ##
@@ -144,3 +154,8 @@ CONFIG_USB_OCTEON_OHCI=y
 CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
 
+##
+## file: unknown
+##
+CONFIG_OCTEON_MMC=m
+