diff --git a/debian/changelog b/debian/changelog
index a1aae24af..1628fad57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ linux (3.18-1~exp1) UNRELEASED; urgency=medium
   * netfilter: Enable IP6_NF_NAT, IP_SET_HASH_MAC, IP_VS_FO, NF_LOG_ARP,
     NF_LOG_BRIDGE, NFT_BRIDGE_REJECT, NFT_MASQ, NFT_MASQ_IPV4, NFT_MASQ_IPV6
     as modules
+  * SCSI,xen: Enable XEN_SCSI_FRONTEND, XEN_SCSI_BACKEND as modules
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 09 Dec 2014 02:08:47 +0000
 
diff --git a/debian/config/config b/debian/config/config
index cec758fed..8cfedd4f6 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3490,6 +3490,7 @@ CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_HPTIOP=m
 CONFIG_VMWARE_PVSCSI=m
+CONFIG_XEN_SCSI_FRONTEND=m
 CONFIG_LIBFC=m
 CONFIG_FCOE=m
 CONFIG_FCOE_FNIC=m
@@ -4542,6 +4543,7 @@ CONFIG_XEN_SYS_HYPERVISOR=y
 CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_SCSI_BACKEND=m
 
 ##
 ## file: fs/Kconfig