diff --git a/debian/changelog b/debian/changelog
index 6fffa4840..8efa0b173 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ linux (4.4.1-1) UNRELEASED; urgency=medium
     (CVE-2016-2383)
   * ALSA: usb-audio: avoid freeing umidi object twice (CVE-2016-2384)
   * udeb: Combine scsi-{common,extra}-modules with scsi-modules
+  * udeb: Use wildcards to include entire classes of drivers:
+    - input-modules: Include HID drivers by default
 
   [ Roger Shimizu ]
   * Enable TTY_PRINTK as module (Closes: #814540).
diff --git a/debian/installer/modules/input-modules b/debian/installer/modules/input-modules
index aeac6491b..f2ce5ed13 100644
--- a/debian/installer/modules/input-modules
+++ b/debian/installer/modules/input-modules
@@ -1,36 +1,40 @@
-hid
-hid-generic
-usbhid
-hid-a4tech ?
-hid-apple ?
-hid-belkin ?
-hid-cherry ?
-hid-chicony ?
-hid-cypress ?
-hid-ezkey ?
-hid-holtek-kbd ?
-hid-kensington ?
-hid-keytouch ?
-hid-kye ?
-hid-lenovo-tpkbd ?
-hid-logitech ?
-hid-logitech-dj
-hid-logitech-hidpp ?
-hid-microsoft ?
-hid-monterey ?
-hid-multitouch ?
-hid-ortek ?
-hid-primax ?
-hid-roccat-isku ?
-hid-roccat-lua ?
-hid-roccat-savu ?
-hid-samsung ?
-hid-speedlink ?
-hid-sunplus ?
-hid-topseed ?
+# Include HID drivers by default
+drivers/hid/**
+
+# Exclude hid-hyperv, packaged in hyperv-modules
+hid-hyperv -
+
+# Exclude drivers for anything but keyboard and mouse/trackball/touchpad
+drivers/hid/hid-*ff -
+hid-dr -
+hid-elecom -
+hid-gyration -
+hid-icade -
+hid-lcpower -
+hid-ntrig -
+hid-petalynx -
+hid-picolcd -
+hid-pl -
+hid-prodikeys -
+hid-ps3remote -
+hid-quanta -
+drivers/hid/hid-roccat-ko* -
+hid-roccat-pyra -
+hid-saitek -
+hid-sensor-hub -
+hid-sony -
+hid-tivo -
+hid-twinhan -
+hid-uclogic -
+hid-wacom -
+hid-waltop -
+hid-wiimote -
+hid-zydacron -
+wacom -
+
+# Miscellaneous input drivers
 synaptics_usb ?
 wistron_btns ?
-i2c-hid ?
 virtio-input ?
 gpio_keys ?
 soc_button_array ?
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index e4c5ab4c4..8f3bd2b8d 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -4,7 +4,7 @@ Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@decadent.org.uk>
 Standards-Version: 3.9.5
 Build-Depends: debhelper, python3:any, quilt,
- cpio <!stage1>, kmod <!stage1>, xz-utils <!stage1>, kernel-wedge <!stage1>, bc <!stage1>
+ cpio <!stage1>, kmod <!stage1>, xz-utils <!stage1>, kernel-wedge (>= 2.92~) <!stage1>, bc <!stage1>
 Build-Depends-Indep: patchutils <!stage1>, xmlto <!stage1>
 Vcs-Git: https://anonscm.debian.org/git/kernel/linux.git
 Vcs-Browser: https://anonscm.debian.org/cgit/kernel/linux.git