diff --git a/debian/changelog b/debian/changelog
index f352c12ae..d9c65b70e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ linux (4.1.3-1) UNRELEASED; urgency=medium
   * KEYS: ensure we free the assoc array edit if edit is valid (CVE-2015-1333)
   * [armel,sh4] linux-image: Recommend u-boot-tools rather than the obsolete
     uboot-mkimage package (Closes: #793608)
+  * [i386/586] Enable KEYBOARD_GPIO_POLLED and LEDS_GPIO as modules, and
+    ALIX, NET5501, GEOS (Closes: #734204)
 
   [ Ian Campbell ]
   * [armhf] Set CONFIG_ARM_TEGRA_CPUFREQ as builtin.
diff --git a/debian/config/i386/config.586 b/debian/config/i386/config.586
index 9b8527684..aa9934b7b 100644
--- a/debian/config/i386/config.586
+++ b/debian/config/i386/config.586
@@ -13,6 +13,9 @@ CONFIG_OLPC_XO1_PM=y
 CONFIG_OLPC_XO1_RTC=y
 CONFIG_OLPC_XO1_SCI=y
 CONFIG_OLPC_XO15_SCI=y
+CONFIG_ALIX=y
+CONFIG_NET5501=y
+CONFIG_GEOS=y
 
 ##
 ## file: arch/x86/Kconfig.cpu
@@ -45,11 +48,21 @@ CONFIG_I2C_ELEKTOR=m
 ##
 # CONFIG_INTEL_IDLE is not set
 
+##
+## file: drivers/input/keyboard/Kconfig
+##
+CONFIG_KEYBOARD_GPIO_POLLED=m
+
 ##
 ## file: drivers/input/mouse/Kconfig
 ##
 CONFIG_MOUSE_PS2_OLPC=y
 
+##
+## file: drivers/leds/Kconfig
+##
+CONFIG_LEDS_GPIO=m
+
 ##
 ## file: drivers/mtd/chips/Kconfig
 ##