diff --git a/debian/changelog b/debian/changelog
index 74809afd0..ad4ea0c2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -158,6 +158,8 @@ linux (4.0.4-1) UNRELEASED; urgency=medium
 
   [ Ian Campbell ]
   * [armhf+arm64] Enabled generic SYSCON regmap reset driver
+  * [arm64] Enable PCI support and related modules, adjusting udeb module lists
+    for new modules.
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 18 May 2015 00:00:06 +0100
 
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index a1618002d..12b148acc 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -6,6 +6,7 @@ CONFIG_ARCH_XGENE=y
 CONFIG_SMP=y
 CONFIG_XEN=y
 CONFIG_COMPAT=y
+CONFIG_PCI=y
 
 ##
 ## file: arch/arm64/crypto/Kconfig
@@ -51,17 +52,48 @@ CONFIG_MMC=y
 CONFIG_MMC_ARMMMCI=m
 CONFIG_MMC_SPI=m
 
+##
+## file: drivers/net/ethernet/Kconfig
+##
+CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+
 ##
 ## file: drivers/net/ethernet/8390/Kconfig
 ##
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NE2K_PCI=m
 
+##
+## file: drivers/net/ethernet/adaptec/Kconfig
+##
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+
 ##
 ## file: drivers/net/ethernet/apm/xgene/Kconfig
 ##
 CONFIG_NET_XGENE=m
 
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+
 ##
 ## file: drivers/net/ethernet/realtek/Kconfig
 ##
@@ -79,6 +111,40 @@ CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
 CONFIG_SMSC911X=m
 
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+
+##
+## file: drivers/net/ethernet/smsc/Kconfig
+##
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_EPIC100=m
+
+##
+## file: drivers/net/fddi/Kconfig
+##
+CONFIG_FDDI=y
+CONFIG_SKFP=m
+
+##
+## file: drivers/pci/host/Kconfig
+##
+CONFIG_PCI_XGENE=y
+
 ##
 ## file: drivers/phy/Kconfig
 ##
@@ -97,6 +163,11 @@ CONFIG_POWER_RESET_SYSCON=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_XGENE=y
 
+##
+## file: drivers/scsi/Kconfig
+##
+CONFIG_SCSI_DMX3191D=m
+
 ##
 ## file: drivers/tty/serial/Kconfig
 ##
diff --git a/debian/installer/arm64/modules/arm64/nic-modules b/debian/installer/arm64/modules/arm64/nic-modules
index dad347cc1..2cab952f7 100644
--- a/debian/installer/arm64/modules/arm64/nic-modules
+++ b/debian/installer/arm64/modules/arm64/nic-modules
@@ -1,4 +1,4 @@
+#include <nic-modules>
 smc91x
 smsc911x
-xen-netfront
 xgene-enet
diff --git a/debian/installer/arm64/modules/arm64/scsi-modules b/debian/installer/arm64/modules/arm64/scsi-modules
index fa172f59f..8909dfb79 100644
--- a/debian/installer/arm64/modules/arm64/scsi-modules
+++ b/debian/installer/arm64/modules/arm64/scsi-modules
@@ -1,2 +1 @@
-sg
-xen-blkfront
+#include <scsi-modules>