diff --git a/debian/changelog b/debian/changelog
index 8504ee518..9e139d36f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -232,6 +232,8 @@ linux (4.0.2-1~exp1) UNRELEASED; urgency=medium
     - Re-enable BLK_DEV_INTEGRITY, SCSI_UFSHCD, TCM_IBLOCK, AUDIT, USER_NS,
       PCI_QUIRKS, FTRACE, DEBUG_BUGVERBOSE, SECURITY
     - Enable DYNAMIC_DEBUG, FRONTSWAP
+  * [arm64,armhf,powerpcspe,x86] gpio: Explicitly enable GPIOLIB, as some
+    drivers now depend on rather than selecting it (fixes FTBFS on i386)
 
   [ Ian Campbell ]
   * [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index b49853933..b1fed84d9 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -29,6 +29,11 @@ CONFIG_AHCI_XGENE=m
 ##
 CONFIG_COMMON_CLK_XGENE=y
 
+##
+## file: drivers/gpio/Kconfig
+##
+CONFIG_GPIOLIB=y
+
 ##
 ## file: drivers/input/misc/Kconfig
 ##
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 2da76fda3..09d51264e 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -197,6 +197,7 @@ CONFIG_EXTCON_PALMAS=m
 ##
 ## file: drivers/gpio/Kconfig
 ##
+CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_DA9052=m
 CONFIG_GPIO_GENERIC_PLATFORM=m
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index c410d4312..efdd70ec0 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -442,6 +442,7 @@ CONFIG_EFI_RUNTIME_MAP=y
 ##
 ## file: drivers/gpio/Kconfig
 ##
+CONFIG_GPIOLIB=y
 # CONFIG_GPIO_F7188X is not set
 # CONFIG_GPIO_SCH is not set
 # CONFIG_GPIO_ICH is not set
diff --git a/debian/config/powerpcspe/config b/debian/config/powerpcspe/config
index 35aa5d46c..d962d9d37 100644
--- a/debian/config/powerpcspe/config
+++ b/debian/config/powerpcspe/config
@@ -25,3 +25,8 @@ CONFIG_PPC_85xx=y
 CONFIG_PHYS_64BIT=y
 CONFIG_SMP=y
 
+##
+## file: drivers/gpio/Kconfig
+##
+CONFIG_GPIOLIB=y
+