diff --git a/debian/changelog b/debian/changelog
index 8164c733..c359a176 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,8 +109,11 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
   * There are no "tape" images with 2.6.16 for S/390.
   * Exclude floppy and el-torito images for i386 as they are not being built.
   * Update exclude-udebs lists.
+  * Exclude 2.4.27 kernel packages from CD1 for sparc and s/390.
+  * Exclude 2.6.15 kernel header and image packages from CD1.
+  * Exclude 2.6.16 xen and vserver kernel  packages from CD1.
 
- -- Frans Pop <fjp@debian.org>  Tue,  1 Aug 2006 17:25:44 +0200
+ -- Frans Pop <fjp@debian.org>  Tue,  1 Aug 2006 17:40:00 +0200
 
 debian-cd (2.2.24) unstable; urgency=low
 
diff --git a/tasks/exclude-etch b/tasks/exclude-etch
index e1cc6fab..6d64b897 100644
--- a/tasks/exclude-etch
+++ b/tasks/exclude-etch
@@ -20,3 +20,143 @@ zmailer
 xmail
 cdebconf
 inetutils-inetd
+kernel-headers-2.4.27-2-sparc32
+kernel-headers-2.4.27-2-sparc32-smp
+kernel-headers-2.4.27-2-sparc64
+kernel-headers-2.4.27-2-sparc64-smp
+kernel-image-2.4.27-2-sparc32
+kernel-image-2.4.27-2-sparc32-smp
+kernel-image-2.4.27-2-sparc64
+kernel-image-2.4.27-2-sparc64-smp
+kernel-image-2.4.27-2-s390
+kernel-image-2.4.27-2-s390-tape
+kernel-image-2.4.27-2-s390x
+linux-headers-2.6.15
+linux-headers-2.6.15-1
+linux-headers-2.6.15-1-486
+linux-headers-2.6.15-1-686
+linux-headers-2.6.15-1-686-smp
+linux-headers-2.6.15-1-alpha-generic
+linux-headers-2.6.15-1-alpha-legacy
+linux-headers-2.6.15-1-alpha-smp
+linux-headers-2.6.15-1-amd64-generic
+linux-headers-2.6.15-1-amd64-k8
+linux-headers-2.6.15-1-amd64-k8-smp
+linux-headers-2.6.15-1-amiga
+linux-headers-2.6.15-1-apus
+linux-headers-2.6.15-1-atari
+linux-headers-2.6.15-1-bvme6000
+linux-headers-2.6.15-1-em64t-p4
+linux-headers-2.6.15-1-em64t-p4-smp
+linux-headers-2.6.15-1-footbridge
+linux-headers-2.6.15-1-hp
+linux-headers-2.6.15-1-itanium
+linux-headers-2.6.15-1-itanium-smp
+linux-headers-2.6.15-1-ixp4xx
+linux-headers-2.6.15-1-k7
+linux-headers-2.6.15-1-k7-smp
+linux-headers-2.6.15-1-mac
+linux-headers-2.6.15-1-mckinley
+linux-headers-2.6.15-1-mckinley-smp
+linux-headers-2.6.15-1-mvme147
+linux-headers-2.6.15-1-mvme16x
+linux-headers-2.6.15-1-nslu2
+linux-headers-2.6.15-1-parisc
+linux-headers-2.6.15-1-parisc64
+linux-headers-2.6.15-1-parisc64-smp
+linux-headers-2.6.15-1-parisc-smp
+linux-headers-2.6.15-1-powerpc
+linux-headers-2.6.15-1-powerpc64
+linux-headers-2.6.15-1-powerpc-miboot
+linux-headers-2.6.15-1-powerpc-smp
+linux-headers-2.6.15-1-q40
+linux-headers-2.6.15-1-rpc
+linux-headers-2.6.15-1-s390
+linux-headers-2.6.15-1-s390x
+linux-headers-2.6.15-1-s3c2410
+linux-headers-2.6.15-1-sparc64
+linux-headers-2.6.15-1-sparc64-smp
+linux-headers-2.6.15-1-sun3
+linux-image-2.6.15-1-486
+linux-image-2.6.15-1-686
+linux-image-2.6.15-1-686-smp
+linux-image-2.6.15-1-alpha-generic
+linux-image-2.6.15-1-alpha-legacy
+linux-image-2.6.15-1-alpha-smp
+linux-image-2.6.15-1-amd64-generic
+linux-image-2.6.15-1-amd64-k8
+linux-image-2.6.15-1-amd64-k8-smp
+linux-image-2.6.15-1-amiga
+linux-image-2.6.15-1-apus
+linux-image-2.6.15-1-atari
+linux-image-2.6.15-1-bvme6000
+linux-image-2.6.15-1-em64t-p4
+linux-image-2.6.15-1-em64t-p4-smp
+linux-image-2.6.15-1-footbridge
+linux-image-2.6.15-1-hp
+linux-image-2.6.15-1-itanium
+linux-image-2.6.15-1-itanium-smp
+linux-image-2.6.15-1-ixp4xx
+linux-image-2.6.15-1-k7
+linux-image-2.6.15-1-k7-smp
+linux-image-2.6.15-1-mac
+linux-image-2.6.15-1-mckinley
+linux-image-2.6.15-1-mckinley-smp
+linux-image-2.6.15-1-mvme147
+linux-image-2.6.15-1-mvme16x
+linux-image-2.6.15-1-nslu2
+linux-image-2.6.15-1-parisc
+linux-image-2.6.15-1-parisc64
+linux-image-2.6.15-1-parisc64-smp
+linux-image-2.6.15-1-parisc-smp
+linux-image-2.6.15-1-powerpc
+linux-image-2.6.15-1-powerpc64
+linux-image-2.6.15-1-powerpc-miboot
+linux-image-2.6.15-1-powerpc-smp
+linux-image-2.6.15-1-q40
+linux-image-2.6.15-1-rpc
+linux-image-2.6.15-1-s390
+linux-image-2.6.15-1-s390x
+linux-image-2.6.15-1-s3c2410
+linux-image-2.6.15-1-sparc64
+linux-image-2.6.15-1-sparc64-smp
+linux-image-2.6.15-1-sun3
+linux-image-2.6.16-2-vserver-686
+linux-image-2.6.16-2-vserver-amd64-k8
+linux-image-2.6.16-2-vserver-em64t-p4
+linux-image-2.6.16-2-vserver-k7
+linux-image-2.6.16-2-vserver-powerpc
+linux-image-2.6.16-2-vserver-powerpc64
+linux-image-2.6.16-2-vserver-s390x
+linux-image-2.6.16-2-xen-686
+linux-image-2.6.16-2-xen-amd64-k8
+linux-image-2.6.16-2-xen-em64t-p4
+linux-image-2.6.16-2-xen-k7
+linux-image-2.6.16-2-xen-vserver-686
+linux-image-2.6.16-2-xen-vserver-amd64-k8
+linux-image-2.6-vserver-686
+linux-image-2.6-vserver-amd64-k8
+linux-image-2.6-vserver-em64t-p4
+linux-image-2.6-vserver-k7
+linux-image-2.6-vserver-powerpc
+linux-image-2.6-vserver-powerpc64
+linux-image-2.6-vserver-s390x
+linux-image-2.6-xen-686
+linux-image-2.6-xen-amd64-k8
+linux-image-2.6-xen-em64t-p4
+linux-image-2.6-xen-k7
+linux-image-2.6-xen-vserver-686
+linux-image-2.6-xen-vserver-amd64-k8
+linux-image-vserver-686
+linux-image-vserver-amd64-k8
+linux-image-vserver-em64t-p4
+linux-image-vserver-k7
+linux-image-vserver-powerpc
+linux-image-vserver-powerpc64
+linux-image-vserver-s390x
+linux-image-xen-686
+linux-image-xen-amd64-k8
+linux-image-xen-em64t-p4
+linux-image-xen-k7
+linux-image-xen-vserver-686
+linux-image-xen-vserver-amd64-k8