diff --git a/debian/changelog b/debian/changelog
index bc8434a9..99a4aaab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -202,6 +202,7 @@ debian-cd (3.0.0) UNRELEASED; urgency=low
 
   [ Frans Pop ]
   * Add linux-image-2.6-prep for powerpc.
+  * Create a new tasks/forcd1-etch file and remove old cruft.
 
   [ Steve McIntyre ]
   * Gunzip the installation manual in .txt and .pdf format, so it's
@@ -209,7 +210,7 @@ debian-cd (3.0.0) UNRELEASED; urgency=low
   * As a last-minute step before building images, fill in the TOTALNUM
     value in the README files in the root of each image.
 
- -- Frans Pop <fjp@debian.org>  Fri, 29 Dec 2006 02:14:05 +0100
+ -- Frans Pop <fjp@debian.org>  Fri, 29 Dec 2006 04:11:53 +0100
 
 debian-cd (2.2.25) unstable; urgency=low
 
diff --git a/tasks/Debian_etch b/tasks/Debian_etch
index 30645696..b19e00bc 100644
--- a/tasks/Debian_etch
+++ b/tasks/Debian_etch
@@ -7,7 +7,7 @@
 /* Packages that should really be on CD1 */
 #include <debian-installer+kernel-etch>
 #include <base-etch>
-#include <forcd1>
+#include <forcd1-etch>
 #include <task-essential-etch>
 
 /* Other interesting packages */
diff --git a/tasks/forcd1-etch b/tasks/forcd1-etch
new file mode 100644
index 00000000..2a9f207b
--- /dev/null
+++ b/tasks/forcd1-etch
@@ -0,0 +1,43 @@
+openssh-client
+openssh-server
+gnupg
+build-essential
+deborphan
+debfoster
+debsums
+localepurge
+chdrvfont
+fbset
+fdutils
+ftp
+g++
+libnet-telnet-perl
+libtimedate-perl
+libmailtools-perl
+pump
+xviddetect
+twm
+menu
+wmaker
+wmakerconf
+libterm-readline-gnu-perl
+whiptail
+dialog
+doc-base
+grub
+util-linux-locales
+gnome-tasksel
+discover
+read-edid
+mdetect
+aptitude
+brltty
+popularity-contest
+ntpdate
+hdparm
+jfbterm
+unifont
+console-cyrillic
+console-terminus
+iso-codes
+network-console-config