diff --git a/debian/changelog b/debian/changelog
index 31ce75da0..3b8fea068 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linux (3.11.5-2) UNRELEASED; urgency=low
+
+  [ Ian Campbell ]
+  * [armhf] Enable Xen and virtio for armmp and armmp-lpae as well as KVM for
+    armmp-lpae only.
+
+ -- Ian Campbell <ijc@hellion.org.uk>  Sat, 19 Oct 2013 10:34:53 +0100
+
 linux (3.11.5-1) unstable; urgency=low
 
   * New upstream stable update:
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 0ae5e6448..26bbed1f8 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -19,6 +19,8 @@ CONFIG_NEON=y
 
 CONFIG_PCI=y
 
+CONFIG_XEN=y
+
 ##
 ## file: arch/arm/Kconfig.debug
 ##
@@ -679,6 +681,11 @@ CONFIG_OMAP2_DSS_SDI=y
 ##
 CONFIG_FB_OMAP2=m
 
+##
+## file: drivers/virtio/Kconfig
+##
+CONFIG_VIRTIO_MMIO=m
+
 ##
 ## file: drivers/watchdog/Kconfig
 ##
diff --git a/debian/config/armhf/config.lpae b/debian/config/armhf/config.lpae
index a23edc64b..ab96c014e 100644
--- a/debian/config/armhf/config.lpae
+++ b/debian/config/armhf/config.lpae
@@ -8,6 +8,12 @@ CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 ##
 CONFIG_ARM_LPAE=y
 
+##
+## file: arch/arm/kvm/Kconfig
+##
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+
 ##
 ## file: drivers/iommu/Kconfig
 ##