diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 7676d1c3f..7205d3312 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -1,7 +1,8 @@
 [base]
 featuresets:
- none
  rt
+flavours:
+ amd64
 kernel-arch: x86
 
 [build]
@@ -15,7 +16,13 @@ configs:
 [amd64_description]
 hardware: 64-bit PCs
 hardware-long: PCs with AMD64 or Intel 64 processors
+parts: xen
 
 [amd64_image]
 configs:
  kernelarch-x86/config-arch-64
+
+[amd64_xen]
+dom0-support: true
+flavours:
+ amd64
diff --git a/debian/config/amd64/none/defines b/debian/config/amd64/none/defines
deleted file mode 100644
index 734a622f7..000000000
--- a/debian/config/amd64/none/defines
+++ /dev/null
@@ -1,11 +0,0 @@
-[base]
-flavours:
- amd64
-
-[amd64_description]
-parts: xen
-
-[amd64_xen]
-dom0-support: true
-flavours:
- amd64
diff --git a/debian/config/i386/none/config.486 b/debian/config/i386/config.486
similarity index 100%
rename from debian/config/i386/none/config.486
rename to debian/config/i386/config.486
diff --git a/debian/config/i386/none/config.686-pae b/debian/config/i386/config.686-pae
similarity index 100%
rename from debian/config/i386/none/config.686-pae
rename to debian/config/i386/config.686-pae
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 806789224..931e4c9ae 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -1,7 +1,10 @@
 [base]
 featuresets:
- none
  rt
+flavours:
+ 486
+ 686-pae
+ amd64
 kernel-arch: x86
 
 [description]
@@ -23,6 +26,7 @@ parts: up
 [486_image]
 configs:
  kernelarch-x86/config-arch-32
+ i386/config.486
 
 [686-pae_build]
 debug-info: true
@@ -30,18 +34,31 @@ debug-info: true
 [686-pae_description]
 hardware: modern PCs
 hardware-long: PCs with one or more processors supporting PAE
-parts: pae
+parts: pae xen
 
 [686-pae_image]
 configs:
  kernelarch-x86/config-arch-32
+ i386/config.686-pae
 recommends: libc6-i686
 
+[686-pae_xen]
+dom0-support: true
+flavours:
+ i386
+ amd64
+
 [amd64_description]
 hardware: 64-bit PCs
 hardware-long: PCs with AMD64 or Intel 64 processors
+parts: xen
 
 [amd64_image]
 configs:
  kernelarch-x86/config-arch-64
 recommends: libc6-i686
+
+[amd64_xen]
+dom0-support: true
+flavours:
+ amd64
diff --git a/debian/config/i386/none/defines b/debian/config/i386/none/defines
deleted file mode 100644
index a6bbd8753..000000000
--- a/debian/config/i386/none/defines
+++ /dev/null
@@ -1,22 +0,0 @@
-[base]
-flavours:
- 486
- 686-pae
- amd64
-
-[686-pae_description]
-parts: xen
-
-[686-pae_xen]
-dom0-support: true
-flavours:
- i386
- amd64
-
-[amd64_description]
-parts: xen
-
-[amd64_xen]
-dom0-support: true
-flavours:
- amd64
diff --git a/debian/config/i386/rt/config.686-pae b/debian/config/i386/rt/config.686-pae
deleted file mode 100644
index 96c3cc35c..000000000
--- a/debian/config/i386/rt/config.686-pae
+++ /dev/null
@@ -1,58 +0,0 @@
-##
-## file: arch/x86/Kconfig
-##
-# CONFIG_X86_32_IRIS is not set
-## choice: High Memory Support
-# CONFIG_NOHIGHMEM is not set
-# CONFIG_HIGHMEM4G is not set
-CONFIG_HIGHMEM64G=y
-## end choice
-CONFIG_X86_PAE=y
-# CONFIG_MATH_EMULATION is not set
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-
-##
-## file: arch/x86/Kconfig.cpu
-##
-## choice: Processor family
-# CONFIG_M486 is not set
-CONFIG_M686=y
-## end choice
-
-##
-## file: arch/x86/xen/Kconfig
-##
-# CONFIG_XEN is not set
-
-##
-## file: drivers/i2c/busses/Kconfig
-##
-# CONFIG_I2C_ELEKTOR is not set
-CONFIG_I2C_STUB=m
-
-##
-## file: drivers/net/ethernet/racal/Kconfig
-##
-# CONFIG_NI5010 is not set
-
-##
-## file: drivers/net/hamradio/Kconfig
-##
-# CONFIG_DMASCC is not set
-
-##
-## file: drivers/pci/hotplug/Kconfig
-##
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-
-##
-## file: drivers/tty/Kconfig
-##
-# CONFIG_MOXA_INTELLIO is not set
-
-##
-## file: lib/Kconfig.debug
-##
-# CONFIG_DEBUG_HIGHMEM is not set
-