diff --git a/debian/changelog b/debian/changelog
index 2e02b15a7..d8e510e81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ linux (4.2.1-2) UNRELEASED; urgency=medium
 
   * media: uvcvideo: Disable hardware timestamps by default (Closes: #794327)
   * [mips*] udeb: Remove 'Provides: ata-modules' from kernel-image
+  * [hppa/parisc64-smp,mips*el/loongson-3] udeb: Remove i2c-modules again, as
+    the drivers that belong in it are actually built-in (fixes FTBFS)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 26 Sep 2015 16:40:51 +0100
 
diff --git a/debian/config/hppa/config.parisc64-smp b/debian/config/hppa/config.parisc64-smp
index 98326f959..e39d0c934 100644
--- a/debian/config/hppa/config.parisc64-smp
+++ b/debian/config/hppa/config.parisc64-smp
@@ -37,6 +37,16 @@ CONFIG_IPMI_POWEROFF=m
 CONFIG_DRM=y
 CONFIG_DRM_RADEON=m
 
+##
+## file: drivers/i2c/Kconfig
+##
+CONFIG_I2C=y
+
+##
+## file: drivers/i2c/algos/Kconfig
+##
+CONFIG_I2C_ALGOBIT=y
+
 ##
 ## file: mm/Kconfig
 ##
diff --git a/debian/config/kernelarch-mips/config.loongson-3 b/debian/config/kernelarch-mips/config.loongson-3
index 68a480bb7..65348682f 100644
--- a/debian/config/kernelarch-mips/config.loongson-3
+++ b/debian/config/kernelarch-mips/config.loongson-3
@@ -33,6 +33,16 @@ CONFIG_SATA_AHCI=y
 CONFIG_DRM=m
 CONFIG_DRM_RADEON=m
 
+##
+## file: drivers/i2c/Kconfig
+##
+CONFIG_I2C=y
+
+##
+## file: drivers/i2c/algos/Kconfig
+##
+CONFIG_I2C_ALGOBIT=y
+
 ##
 ## file: drivers/net/ethernet/8390/Kconfig
 ##
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/i2c-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/i2c-modules
deleted file mode 100644
index 203a607e7..000000000
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/i2c-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <i2c-modules>
diff --git a/debian/installer/hppa/package-list b/debian/installer/hppa/package-list
index edbeff4ec..a44aeb8fb 100644
--- a/debian/installer/hppa/package-list
+++ b/debian/installer/hppa/package-list
@@ -4,6 +4,7 @@
 # It overwrites specifications from /usr/share/kernel-wedge/package-list.
 #
 Package: kernel-image
+Provides_parisc64-smp: i2c-modules
 
 Package: usb-storage-modules
 Depends: kernel-image, ide-modules, scsi-modules, usb-modules
diff --git a/debian/installer/mips64el/package-list b/debian/installer/mips64el/package-list
index b7141bb20..621363abe 100644
--- a/debian/installer/mips64el/package-list
+++ b/debian/installer/mips64el/package-list
@@ -5,3 +5,4 @@
 #
 Package: kernel-image
 Provides: rtc-modules
+Provides_loongson-3: i2c-modules, rtc-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/i2c-modules b/debian/installer/mipsel/modules/mipsel-loongson-3/i2c-modules
deleted file mode 100644
index 203a607e7..000000000
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/i2c-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <i2c-modules>
diff --git a/debian/installer/mipsel/package-list b/debian/installer/mipsel/package-list
index b7141bb20..621363abe 100644
--- a/debian/installer/mipsel/package-list
+++ b/debian/installer/mipsel/package-list
@@ -5,3 +5,4 @@
 #
 Package: kernel-image
 Provides: rtc-modules
+Provides_loongson-3: i2c-modules, rtc-modules