diff --git a/debian/changelog b/debian/changelog
index b3bc8908..47813d98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-cd (2.2.21) UNRELEASED; urgency=low
+
+  * Joey Hess
+    - Exclude all the new amd64 kernel images from cd #1, no space.
+    - Forgot to exclude old kernel-image-2.6.7-1-686-smp from cd #1.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2004 03:03:36 -0400
+
 debian-cd (2.2.20) unstable; urgency=medium
 
   * Joey Hess
diff --git a/tasks/exclude-sarge b/tasks/exclude-sarge
index e33266f9..d5e24557 100644
--- a/tasks/exclude-sarge
+++ b/tasks/exclude-sarge
@@ -55,6 +55,11 @@ kernel-image-2.6-386
 kernel-image-2.6-686
 kernel-image-2.6-686-smp
 kernel-image-2.6-k7
+kernel-image-2.6-amd64-generic
+kernel-image-2.6-amd64-k8
+kernel-image-2.6-amd64-k8-smp
+kernel-image-2.6-em64t-p4
+kernel-image-2.6-em64t-p4-smp
 kernel-image-2.6-k7-smp
 kernel-image-2.6.3-1-386
 kernel-image-2.6.3-1-686
@@ -73,12 +78,23 @@ kernel-image-2.6.6-1-k7
 kernel-image-2.6.6-1-k7-smp
 kernel-image-2.6.7-1-386
 kernel-image-2.6.7-1-686
+kernel-image-2.6.7-1-686-smp
 kernel-image-2.6.7-1-k7
 kernel-image-2.6.7-1-k7-smp
 kernel-image-2.6.8-1-k7
 kernel-image-2.6.8-1-k7-smp
+kernel-image-2.6.8-9-amd64-k8-smp
+kernel-image-2.6.8-9-amd64-k8
+kernel-image-2.6.8-9-amd64-generic
+kernel-image-2.6.8-9-em64t-p4-smp
+kernel-image-2.6.8-9-em64t-p4
 kernel-image-2.6.9-1-k7
 kernel-image-2.6.9-1-k7-smp
+kernel-image-2.6.9-1-amd64-k8-smp
+kernel-image-2.6.9-1-amd64-k8
+kernel-image-2.6.9-1-amd64-generic
+kernel-image-2.6.9-1-em64t-p4-smp
+kernel-image-2.6.9-1-em64t-p4
 kernel-pcmcia-modules-2.4-386
 kernel-pcmcia-modules-2.4-586tsc
 kernel-pcmcia-modules-2.4-686
diff --git a/tasks/unexclude-CD2-sarge b/tasks/unexclude-CD2-sarge
index efc3e250..d5e24557 100644
--- a/tasks/unexclude-CD2-sarge
+++ b/tasks/unexclude-CD2-sarge
@@ -32,7 +32,6 @@ kernel-image-2.4.24-1-k6
 kernel-image-2.4.24-1-k7
 kernel-image-2.4.24-1-k7-smp
 kernel-image-2.4.24-speakup
-kernel-image-2.4.26-speakup
 kernel-image-2.4.25-1-386
 kernel-image-2.4.25-1-586tsc
 kernel-image-2.4.25-1-686
@@ -40,6 +39,8 @@ kernel-image-2.4.25-1-686-smp
 kernel-image-2.4.25-1-k6
 kernel-image-2.4.25-1-k7
 kernel-image-2.4.25-1-k7-smp
+kernel-image-2.4.26-speakup
+kernel-image-2.4.26-1-386
 kernel-image-2.4.26-1-586tsc
 kernel-image-2.4.26-1-686
 kernel-image-2.4.26-1-686-smp
@@ -47,21 +48,18 @@ kernel-image-2.4.26-1-k6
 kernel-image-2.4.26-1-k7
 kernel-image-2.4.26-1-k7-smp
 kernel-image-2.4.27-1-586tsc
-kernel-image-2.4.27-1-686
-kernel-image-2.4.27-1-686-smp
 kernel-image-2.4.27-1-k6
 kernel-image-2.4.27-1-k7
 kernel-image-2.4.27-1-k7-smp
-kernel-image-2.4.28-1-586tsc
-kernel-image-2.4.28-1-686
-kernel-image-2.4.28-1-686-smp
-kernel-image-2.4.28-1-k6
-kernel-image-2.4.28-1-k7
-kernel-image-2.4.28-1-k7-smp
 kernel-image-2.6-386
 kernel-image-2.6-686
 kernel-image-2.6-686-smp
 kernel-image-2.6-k7
+kernel-image-2.6-amd64-generic
+kernel-image-2.6-amd64-k8
+kernel-image-2.6-amd64-k8-smp
+kernel-image-2.6-em64t-p4
+kernel-image-2.6-em64t-p4-smp
 kernel-image-2.6-k7-smp
 kernel-image-2.6.3-1-386
 kernel-image-2.6.3-1-686
@@ -78,18 +76,25 @@ kernel-image-2.6.6-1-686
 kernel-image-2.6.6-1-686-smp
 kernel-image-2.6.6-1-k7
 kernel-image-2.6.6-1-k7-smp
+kernel-image-2.6.7-1-386
 kernel-image-2.6.7-1-686
 kernel-image-2.6.7-1-686-smp
 kernel-image-2.6.7-1-k7
 kernel-image-2.6.7-1-k7-smp
-kernel-image-2.6.8-1-686
-kernel-image-2.6.8-1-686-smp
 kernel-image-2.6.8-1-k7
 kernel-image-2.6.8-1-k7-smp
-kernel-image-2.6.9-1-686
-kernel-image-2.6.9-1-686-smp
+kernel-image-2.6.8-9-amd64-k8-smp
+kernel-image-2.6.8-9-amd64-k8
+kernel-image-2.6.8-9-amd64-generic
+kernel-image-2.6.8-9-em64t-p4-smp
+kernel-image-2.6.8-9-em64t-p4
 kernel-image-2.6.9-1-k7
 kernel-image-2.6.9-1-k7-smp
+kernel-image-2.6.9-1-amd64-k8-smp
+kernel-image-2.6.9-1-amd64-k8
+kernel-image-2.6.9-1-amd64-generic
+kernel-image-2.6.9-1-em64t-p4-smp
+kernel-image-2.6.9-1-em64t-p4
 kernel-pcmcia-modules-2.4-386
 kernel-pcmcia-modules-2.4-586tsc
 kernel-pcmcia-modules-2.4-686
@@ -111,6 +116,7 @@ kernel-pcmcia-modules-2.4.25-1-686-smp
 kernel-pcmcia-modules-2.4.25-1-k6
 kernel-pcmcia-modules-2.4.25-1-k7
 kernel-pcmcia-modules-2.4.25-1-k7-smp
+kernel-pcmcia-modules-2.4.26-1-386
 kernel-pcmcia-modules-2.4.26-1-586tsc
 kernel-pcmcia-modules-2.4.26-1-686
 kernel-pcmcia-modules-2.4.26-1-686-smp
@@ -118,14 +124,10 @@ kernel-pcmcia-modules-2.4.26-1-k6
 kernel-pcmcia-modules-2.4.26-1-k7
 kernel-pcmcia-modules-2.4.26-1-k7-smp
 kernel-pcmcia-modules-2.4.27-1-586tsc
-kernel-pcmcia-modules-2.4.27-1-686
-kernel-pcmcia-modules-2.4.27-1-686-smp
 kernel-pcmcia-modules-2.4.27-1-k6
 kernel-pcmcia-modules-2.4.27-1-k7
 kernel-pcmcia-modules-2.4.27-1-k7-smp
 kernel-pcmcia-modules-2.4.28-1-586tsc
-kernel-pcmcia-modules-2.4.28-1-686
-kernel-pcmcia-modules-2.4.28-1-686-smp
 kernel-pcmcia-modules-2.4.28-1-k6
 kernel-pcmcia-modules-2.4.28-1-k7
 kernel-pcmcia-modules-2.4.28-1-k7-smp