diff --git a/debian/changelog b/debian/changelog
index 509fba1cf..a1e897308 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ linux (4.4.1-1) UNRELEASED; urgency=medium
     - input-modules: Include HID drivers by default
     - nic{,-pcmcia,-usb,-wireless}-modules: Include Ethernet, USB and wireless
       drivers by default
+    - {pata,sata}-modules: Include ATA drivers by default
 
   [ Roger Shimizu ]
   * Enable TTY_PRINTK as module (Closes: #814540).
diff --git a/debian/installer/modules/pata-modules b/debian/installer/modules/pata-modules
index dd8450d65..1d963a18e 100644
--- a/debian/installer/modules/pata-modules
+++ b/debian/installer/modules/pata-modules
@@ -1,40 +1,9 @@
-pata_ali ?
-pata_amd ?
-pata_artop ?
-pata_atiixp ?
-pata_cmd64x ?
-pata_cs5520 ?
-pata_cs5530 ?
-pata_cs5535 ?
-pata_cypress ?
-pata_efar ?
-pata_hpt366 ?
-pata_hpt37x ?
-pata_hpt3x2n ?
-pata_hpt3x3 ?
-pata_isapnp ?
-pata_it821x ?
-pata_jmicron ?
-pata_legacy ?
-pata_marvell ?
-pata_mpiix ?
-pata_netcell ?
-pata_ns87410 ?
-pata_oldpiix ?
-pata_opti ?
-pata_optidma ?
-pata_pdc2027x ?
-pata_pdc202xx_old ?
-pata_piccolo ?
-pata_qdi ?
-pata_radisys ?
-pata_rdc ?
-pata_rz1000 ?
-pata_sc1200 ?
-pata_serverworks ?
-pata_sil680 ?
-pata_sch ?
-pata_sl82c105 ?
-pata_triflex ?
-pata_via ?
-pata_winbond ?
+# Include PATA drivers by default
+drivers/ata/pata_*
+
+# Exclude pata_sis, which goes in sata-modules as a dependency of sata_sis
+pata_sis -
+
+# Exclude drivers packaged in pcmcia-storage-modules
+pata_ninja32 -
+pata_pcmcia -
diff --git a/debian/installer/modules/sata-modules b/debian/installer/modules/sata-modules
index e1a90ee42..e5043ad74 100644
--- a/debian/installer/modules/sata-modules
+++ b/debian/installer/modules/sata-modules
@@ -1,22 +1,15 @@
-ata_piix ?
-sata_nv ?
-sata_promise ?
-sata_sil ?
-sata_sis ?
+# Include SATA drivers by default
+drivers/ata/sata_*
+
 # sata-sis depends on pata-sis; avoid a dependency
 pata_sis ?
-sata_sil24 ?
-sata_svw ?
-sata_sx4 ?
-sata_via ?
-sata_vsc ?
-sata_qstor ?
-sata_uli ?
+
+# Include more SATA drivers with unusual names
+ata_piix ?
 ahci ?
 sx8 ?
-sata_sx4 ?
-sata_mv ?
 pdc_adma ?
 mtip32xx ?
+
 # XXX not actually SATA
 nvme ?