diff --git a/debian/changelog b/debian/changelog
index 60c2e228d..26c953473 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ linux (4.13~rc7-1~exp2) UNRELEASED; urgency=medium
     Add check for uncompressed Image size, which is necessary for
     armel/marvell flavour currently.
 
+  [ Ben Hutchings ]
+  * [mips*/octeon] mmc: Enable MMC_CAVIUM_OCTEON as module (Closes: #800594)
+
  -- Roger Shimizu <rogershimizu@gmail.com>  Thu, 31 Aug 2017 19:47:54 +0900
 
 linux (4.13~rc7-1~exp1) experimental; urgency=medium
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index 8ca915304..72c3fde62 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -99,6 +99,11 @@ CONFIG_MMC=m
 ##
 CONFIG_MMC_BLOCK=m
 
+##
+## file: drivers/mmc/host/Kconfig
+##
+CONFIG_MMC_CAVIUM_OCTEON=m
+
 ##
 ## file: drivers/mtd/Kconfig
 ##
@@ -177,10 +182,3 @@ CONFIG_USB_OCTEON_OHCI=y
 CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
 
-##
-## file: unknown
-##
-#. octeon_mmc driver was requested in #800594, but still hasn't landed
-#. upstream.  Last submitted at: https://lkml.org/lkml/2016/12/19/185
-CONFIG_OCTEON_MMC=m
-