diff --git a/debian/changelog b/debian/changelog
index c5f3d10d4..08df9e185 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ linux (4.9.18-2) UNRELEASED; urgency=medium
   * [powerpc/powerpc64,ppc64*] target: Enable SCSI_IBMVSCSIS as module
   * cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores
     (Closes: #859978)
+  * udeb: Include all AHCI drivers in sata-modules (Closes: #860335)
 
   [ Salvatore Bonaccorso ]
   * ping: implement proper locking (CVE-2017-2671)
diff --git a/debian/installer/arm64/modules/arm64/sata-modules b/debian/installer/arm64/modules/arm64/sata-modules
index 312af7bcc..740a93c36 100644
--- a/debian/installer/arm64/modules/arm64/sata-modules
+++ b/debian/installer/arm64/modules/arm64/sata-modules
@@ -1,7 +1,4 @@
 #include <sata-modules>
-ahci_platform
-ahci_tegra
-ahci_xgene
 phy-qcom-apq8064-sata
 phy-qcom-ipq806x-sata
 phy-xgene
diff --git a/debian/installer/armhf/modules/armhf-armmp/sata-modules b/debian/installer/armhf/modules/armhf-armmp/sata-modules
index 70d5e3674..8e7e1ed2c 100644
--- a/debian/installer/armhf/modules/armhf-armmp/sata-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/sata-modules
@@ -1,8 +1,4 @@
 #include <sata-modules>
-ahci_platform
-ahci_imx
-ahci_sunxi
-ahci_tegra
 sata_highbank
 
 # SATA PHYs
diff --git a/debian/installer/mips/modules/mips-octeon/sata-modules b/debian/installer/mips/modules/mips-octeon/sata-modules
index 87cdd4188..01318c258 100644
--- a/debian/installer/mips/modules/mips-octeon/sata-modules
+++ b/debian/installer/mips/modules/mips-octeon/sata-modules
@@ -1,3 +1 @@
 #include <sata-modules>
-ahci_platform
-ahci_octeon
diff --git a/debian/installer/modules/sata-modules b/debian/installer/modules/sata-modules
index e5043ad74..e3be90bd3 100644
--- a/debian/installer/modules/sata-modules
+++ b/debian/installer/modules/sata-modules
@@ -1,12 +1,13 @@
 # Include SATA drivers by default
+drivers/ata/ahci* ?
 drivers/ata/sata_*
 
 # sata-sis depends on pata-sis; avoid a dependency
 pata_sis ?
 
 # Include more SATA drivers with unusual names
+acard-ahci ?
 ata_piix ?
-ahci ?
 sx8 ?
 pdc_adma ?
 mtip32xx ?