diff --git a/debian/changelog b/debian/changelog
index 091dc3638..220d4b735 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (3.8.11-2) UNRELEASED; urgency=low
+
+  * [rt] Remove xen-linux-system packages and references to Xen support,
+    as Xen does not support real-time scheduling
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Mon, 06 May 2013 03:59:09 +0100
+
 linux (3.8.11-1) unstable; urgency=high
 
   * New upstream stable update:
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index dd4b89bca..d039daeb0 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -1,5 +1,6 @@
 [base]
 featuresets:
+ none
  rt
 flavours:
  amd64
@@ -15,12 +16,7 @@ configs:
 [amd64_description]
 hardware: 64-bit PCs
 hardware-long: PCs with AMD64, Intel 64 or VIA Nano processors
-parts: xen
 
 [amd64_image]
 configs:
  kernelarch-x86/config-arch-64
-
-[amd64_xen]
-flavours:
- amd64
diff --git a/debian/config/amd64/none/defines b/debian/config/amd64/none/defines
new file mode 100644
index 000000000..1a93252b7
--- /dev/null
+++ b/debian/config/amd64/none/defines
@@ -0,0 +1,10 @@
+[base]
+flavours:
+ amd64
+
+[amd64_description]
+parts: xen
+
+[amd64_xen]
+flavours:
+ amd64
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 7a2335b43..602e25213 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -1,10 +1,7 @@
 [base]
 featuresets:
+ none
  rt
-flavours:
- 486
- 686-pae
- amd64
 kernel-arch: x86
 
 [description]
@@ -33,7 +30,7 @@ debug-info: true
 [686-pae_description]
 hardware: modern PCs
 hardware-long: PCs with one or more processors supporting PAE
-parts: pae xen
+parts: pae
 
 [686-pae_image]
 configs:
@@ -41,11 +38,6 @@ configs:
  i386/config.686-pae
 recommends: libc6-i686
 
-[686-pae_xen]
-flavours:
- i386
- amd64
-
 [amd64_description]
 hardware: 64-bit PCs
 hardware-long: PCs with AMD64, Intel 64 or VIA Nano processors
@@ -55,7 +47,3 @@ parts: xen
 configs:
  kernelarch-x86/config-arch-64
 recommends: libc6-i686
-
-[amd64_xen]
-flavours:
- amd64
diff --git a/debian/config/i386/none/defines b/debian/config/i386/none/defines
new file mode 100644
index 000000000..79d59f812
--- /dev/null
+++ b/debian/config/i386/none/defines
@@ -0,0 +1,20 @@
+[base]
+flavours:
+ 486
+ 686-pae
+ amd64
+
+[686-pae_description]
+parts: xen
+
+[686-pae_xen]
+flavours:
+ i386
+ amd64
+
+[amd64_description]
+parts: xen
+
+[amd64_xen]
+flavours:
+ amd64