diff --git a/debian/arch/i386/defines b/debian/arch/i386/defines
index 65e99e36f..080e78d81 100644
--- a/debian/arch/i386/defines
+++ b/debian/arch/i386/defines
@@ -8,9 +8,9 @@ flavours:
 kernel-arch: i386
 kernel-header-dirs: i386
 subarches:
- vserver
- xen
- xen-vserver
+# vserver
+# xen
+# xen-vserver
 
 [image]
 conflicts: grub (<= 0.95+cvs20040624-17)
diff --git a/debian/arch/powerpc/defines b/debian/arch/powerpc/defines
index be2c30f24..519231a97 100644
--- a/debian/arch/powerpc/defines
+++ b/debian/arch/powerpc/defines
@@ -8,7 +8,7 @@ kernel-header-dirs: powerpc ppc m68k
 kernel-arch: powerpc
 kpkg-subarch: ppc
 subarches:
- vserver
+# vserver
 
 [apus]
 depends: mkvmlinuz (>= 20)
diff --git a/debian/changelog b/debian/changelog
index 1792af7f4..40a1f3dfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,14 @@ linux-2.6 (2.6.17-rc3-99experimental.1) UNRELEASED; urgency=low
   [ Frederik Schüler ]
   * New upstream release.
   * Switch HZ from 1000 to 250, following upstreams default.
+  * deactivate xen for amd64 and i386, vserver for amd64 i386 powerpc.
 
   [ maximilian attems ]
   * Disable broken and known unsecure LSM modules: CONFIG_SECURITY_SECLVL,
     CONFIG_SECURITY_ROOTPLUG. Upstream plans to remove them for 2.6.18
 
- -- Frederik Schüler <fs@debian.org>  Sun, 30 Apr 2006 15:54:15 +0200
+
+ -- Frederik Schüler <fs@debian.org>  Sun, 30 Apr 2006 16:35:05 +0200
 
 linux-2.6 (2.6.16-11) UNRELEASED; urgency=low
 
diff --git a/debian/patches/series/99experimental.1-extra b/debian/patches/series/99experimental.1-extra
index e2f337b0e..50b2eaac3 100644
--- a/debian/patches/series/99experimental.1-extra
+++ b/debian/patches/series/99experimental.1-extra
@@ -1,26 +1,13 @@
-+ xen-tree-merge-22448.patch *_xen *_xen-vserver
-+ xen-tls.patch *_xen *_xen-vserver
 + maclist.patch arm armeb
-+ arm-nslu2-maclist.patch arm armeb
-+ vserver-version.patch *_vserver *_xen-vserver
-+ vserver-vs2.0.2-rc13.patch *_vserver *_xen-vserver
-+ vserver-xen-clash.patch *_xen-vserver
+#FIXME + arm-nslu2-maclist.patch arm armeb
 + mips-tulip.patch mipsel
 + mips-tulip_dc21143.patch mipsel
-+ vserver-vs2.0.2-rc14-update.patch *_vserver *_xen-vserver
-+ vserver-vs2.0.2-rc15-update.patch *_vserver
-+ xen-tree-merge-22448.patch *_xen *_xen-vserver
-+ xen-tls.patch *_xen *_xen-vserver
-+ arm-nslu2-maclist.patch arm armeb
-+ maclist.patch arm armeb
-+ mips-tulip.patch mipsel
-+ mips-tulip_dc21143.patch mipsel
-+ vserver-version.patch *_vserver *_xen-vserver
-+ vserver-vs2.0.2-rc13.patch *_vserver *_xen-vserver
-+ vserver-vs2.0.2-rc14-update.patch *_vserver *_xen-vserver
-+ vserver-vs2.0.2-rc15-update.patch *_vserver
-+ vserver-vs2.0.2-rc17-update.patch *_vserver
-+ vserver-vs2.0.2-rc18-update.patch *_vserver
-+ vserver-xen-clash.patch *_xen-vserver
-+ xen-tls.patch *_xen *_xen-vserver
-+ xen-tree-merge-22448.patch *_xen *_xen-vserver
+#+ xen-tree-merge-22448.patch *_xen *_xen-vserver
+#+ xen-tls.patch *_xen *_xen-vserver
+#+ vserver-version.patch *_vserver *_xen-vserver
+#+ vserver-xen-clash.patch *_xen-vserver
+#+ vserver-vs2.0.2-rc13.patch *_vserver *_xen-vserver
+#+ vserver-vs2.0.2-rc14-update.patch *_vserver *_xen-vserver
+#+ vserver-vs2.0.2-rc15-update.patch *_vserver
+#+ vserver-vs2.0.2-rc17-update.patch *_vserver
+#+ vserver-vs2.0.2-rc18-update.patch *_vserver