diff --git a/debian/changelog b/debian/changelog
index 6577afb12..fa2a4d54c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ linux (4.3.1-1~exp1) UNRELEASED; urgency=medium
   * [x86] drm/i915: Mark uneven memory banks on gen4 desktop as unknown
     swizzling (Closes: #780363)
   * Enable CC_STACKPROTECTOR_STRONG (Closes: #805652)
+  * [x86] input: Enable KEYBOARD_GPIO, INPUT_SOC_BUTTON_ARRAY (Closes: #804864)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 09 Dec 2015 23:20:32 +0000
 
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index c91333518..66f7fb91b 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -711,6 +711,7 @@ CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_LKKBD=m
+CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_NEWTON=m
 CONFIG_KEYBOARD_SUNKBD=m
 CONFIG_KEYBOARD_XTKBD=m
@@ -724,6 +725,7 @@ CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 
 ##
 ## file: drivers/input/mouse/Kconfig
diff --git a/debian/installer/modules/input-modules b/debian/installer/modules/input-modules
index 55c440b2c..bfc4dda29 100644
--- a/debian/installer/modules/input-modules
+++ b/debian/installer/modules/input-modules
@@ -30,3 +30,5 @@ synaptics_usb ?
 wistron_btns ?
 i2c-hid ?
 virtio-input ?
+gpio_keys ?
+soc_button_array ?