diff --git a/debian/changelog b/debian/changelog
index 93658c4f2..35e2b85bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ linux (3.16.2-1) UNRELEASED; urgency=medium
   * sound/firewire: Enable SND_DICE, SND_FIREWORKS, SND_BEBOB as modules
     (Closes: #756842)
   * hid-sony: Enable SONY_FF (Closes: #760684)
+  * mtd: Enable MTD_SPI_NOR as module, since M25P80 now depends on it
 
   [ Vagrant Cascadian ]
   * [armmp] Enable IMX_IPUV3_CORE (closes: #756810).
diff --git a/debian/config/config b/debian/config/config
index eada038c2..4158deb18 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2179,6 +2179,11 @@ CONFIG_MTD_ONENAND_VERIFY_WRITE=y
 # CONFIG_MTD_ONENAND_OTP is not set
 CONFIG_MTD_ONENAND_2X_PROGRAM=y
 
+##
+## file: drivers/mtd/spi-nor/Kconfig
+##
+CONFIG_MTD_SPI_NOR=m
+
 ##
 ## file: drivers/mtd/ubi/Kconfig
 ##