diff --git a/debian/changelog b/debian/changelog
index 306d52080..4a0f19c48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ linux (4.19.20-2) UNRELEASED; urgency=medium
   * udeb: Make nic-wireless-modules depend on mmc-core-modules, not mmc-modules
   * [powerpc*] udeb: Add i2c-modules, mmc-core-modules, nic-wireless-modules
   * [arm64,armhf] udeb: Add mmc-core-modules to Provides of kernel-image
+  * udeb: Add fb-modules and include drm and drm_kms_helper on most
+    architecures
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 12 Feb 2019 12:49:10 +0000
 
diff --git a/debian/installer/modules/alpha-generic/fb-modules b/debian/installer/modules/alpha-generic/fb-modules
new file mode 100644
index 000000000..aba524d90
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/fb-modules
@@ -0,0 +1 @@
+#include <fb-modules>
diff --git a/debian/installer/modules/amd64/fb-modules b/debian/installer/modules/amd64/fb-modules
index 06fb9d2f8..8e9892fea 100644
--- a/debian/installer/modules/amd64/fb-modules
+++ b/debian/installer/modules/amd64/fb-modules
@@ -1,2 +1,4 @@
+#include <fb-modules>
+
 vesafb ?
 vga16fb
diff --git a/debian/installer/modules/arm64/fb-modules b/debian/installer/modules/arm64/fb-modules
index f96aaeada..81e866bc1 100644
--- a/debian/installer/modules/arm64/fb-modules
+++ b/debian/installer/modules/arm64/fb-modules
@@ -1,2 +1,4 @@
+#include <fb-modules>
+
 ast
 tegra-drm
diff --git a/debian/installer/modules/armhf-armmp/fb-modules b/debian/installer/modules/armhf-armmp/fb-modules
index 8ec57ab80..f3d4b2a64 100644
--- a/debian/installer/modules/armhf-armmp/fb-modules
+++ b/debian/installer/modules/armhf-armmp/fb-modules
@@ -1,3 +1,5 @@
+#include <fb-modules>
+
 imxdrm
 dw_hdmi-imx
 tegra-drm
diff --git a/debian/installer/modules/fb-modules b/debian/installer/modules/fb-modules
new file mode 100644
index 000000000..cfc8d5a9c
--- /dev/null
+++ b/debian/installer/modules/fb-modules
@@ -0,0 +1,5 @@
+# We don't include all DRM drivers here as on many platforms we can
+# call system firmware to get hold of a simple framebuffer
+
+drm
+drm_kms_helper
diff --git a/debian/installer/modules/hppa-parisc64-smp/fb-modules b/debian/installer/modules/hppa-parisc64-smp/fb-modules
index acaf53bba..d0424dc9f 100644
--- a/debian/installer/modules/hppa-parisc64-smp/fb-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/fb-modules
@@ -1,6 +1,4 @@
-drm ?
-drm_kms_helper ?
+#include <fb-modules>
+
 radeon ?
 ttm ?
-
-
diff --git a/debian/installer/modules/i386/fb-modules b/debian/installer/modules/i386/fb-modules
index b664dcb55..9602502af 100644
--- a/debian/installer/modules/i386/fb-modules
+++ b/debian/installer/modules/i386/fb-modules
@@ -1,3 +1,5 @@
+#include <fb-modules>
+
 lxfb ?
 vesafb ?
 vga16fb
diff --git a/debian/installer/modules/mips-4kc-malta/fb-modules b/debian/installer/modules/mips-4kc-malta/fb-modules
new file mode 100644
index 000000000..aba524d90
--- /dev/null
+++ b/debian/installer/modules/mips-4kc-malta/fb-modules
@@ -0,0 +1 @@
+#include <fb-modules>
diff --git a/debian/installer/modules/mipsel-loongson-3/fb-modules b/debian/installer/modules/mipsel-loongson-3/fb-modules
index b2b61da1d..0104d9ed3 100644
--- a/debian/installer/modules/mipsel-loongson-3/fb-modules
+++ b/debian/installer/modules/mipsel-loongson-3/fb-modules
@@ -1,3 +1,5 @@
+#include <fb-modules>
+
 radeon
 ast
 sm750fb
diff --git a/debian/installer/modules/powerpc-powerpc64/fb-modules b/debian/installer/modules/powerpc-powerpc64/fb-modules
new file mode 100644
index 000000000..98c5ecc31
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/fb-modules
@@ -0,0 +1,2 @@
+# We *don't* want the extra modules listed in powerpc/fb-modules
+#include <fb-modules>
diff --git a/debian/installer/modules/powerpc/fb-modules b/debian/installer/modules/powerpc/fb-modules
index 29bfc4c39..3a53ab269 100644
--- a/debian/installer/modules/powerpc/fb-modules
+++ b/debian/installer/modules/powerpc/fb-modules
@@ -1,3 +1,5 @@
+#include <fb-modules>
+
 # 32-bit PowerMacs mostly have either ATI Rage 128 or Radeon graphics
 # chips for which the offb driver doesn't work properly.  aty128fb is
 # currently built-in but that could plausibly change in future.
diff --git a/debian/installer/modules/ppc64el/fb-modules b/debian/installer/modules/ppc64el/fb-modules
new file mode 100644
index 000000000..aba524d90
--- /dev/null
+++ b/debian/installer/modules/ppc64el/fb-modules
@@ -0,0 +1 @@
+#include <fb-modules>
diff --git a/debian/installer/modules/riscv64/fb-modules b/debian/installer/modules/riscv64/fb-modules
new file mode 100644
index 000000000..aba524d90
--- /dev/null
+++ b/debian/installer/modules/riscv64/fb-modules
@@ -0,0 +1 @@
+#include <fb-modules>
diff --git a/debian/installer/modules/sparc64/fb-modules b/debian/installer/modules/sparc64/fb-modules
new file mode 100644
index 000000000..aba524d90
--- /dev/null
+++ b/debian/installer/modules/sparc64/fb-modules
@@ -0,0 +1 @@
+#include <fb-modules>