diff --git a/tasks/Debian_woody b/tasks/Debian_woody
index 5e7495b5..83e2acfb 100644
--- a/tasks/Debian_woody
+++ b/tasks/Debian_woody
@@ -11,12 +11,12 @@
 #include "Debian_woody_nonUS"
 #endif
 
-#include <interesting-tasks-potato>
-
 /* Packages that should really be on CD1 */
 #include <base-woody>
 #include <forcd1>
 
+#include <task-woody>
+
 #include <xservers-XFree3>
 
 #include <interesting-redhat>
diff --git a/tasks/task-woody b/tasks/task-woody
new file mode 100644
index 00000000..88f3612f
--- /dev/null
+++ b/tasks/task-woody
@@ -0,0 +1,148 @@
+/* This files lists the packages that have a Task: field
+ * and that should be included on CD1
+ *
+ * The content should be regenerated from time to time. A command line
+ * similar to this one can be used :
+ *
+ * apt-cache dumpavail | grep-dctrl - -F Task -s Package | sed s/Package:\ //
+ *
+ * Last update: 2001-09-03
+ *
+ */
+
+analog
+automake
+autoproject
+bg5ps
+binutils
+bison
+blt-dev
+bsdgames
+c2man
+cce
+cflow
+chdrv
+chinput
+cjk-latex
+cpp
+cutils
+cvs
+cxref
+ddd
+debian-zh-faq-s
+dlint
+doc-linux-zh
+doc-linux-zh-s
+emacs20
+exim
+finger
+fingerd
+flex
+fortune-zh
+ftnchek
+ftpd
+fweb
+g++
+g77
+gadfly
+gcc
+gettext
+gimp-python
+glibc-doc
+gs
+htmlgen
+idle
+indent
+inn2
+itcl3.1-dev
+itk3.1-dev
+jfbterm
+kon2
+liwc
+locales
+lpr
+ltrace
+magicfilter
+mailagent
+mailx
+make
+manpages
+manpages-dev
+metrics
+mtr
+netcat
+nethack
+nfs-kernel-server
+nowebm
+patch
+pdksh
+pydb
+pydict
+python-base
+python-bobo
+python-bobopos
+python-dev
+python-doc
+python-examples
+python-extclass
+python-gdbm
+python-gdk-imlib
+python-gendoc
+python-glade
+python-gnome
+python-gtk
+python-imaging-sane
+python-imaging-tk
+python-kjbuckets
+python-ldap
+python-mpz
+python-mxdatetime
+python-mxstack
+python-mxtexttools
+python-mxtools
+python-netcdf
+python-newt
+python-numeric
+python-numeric-tutorial
+python-pam
+python-pmw
+python-tk
+python-xml
+pythondoc
+qpopper
+rxvt-ml
+samba
+samba-doc
+saml
+screen
+slatec
+smbfs
+stardic
+stl-manual
+sulfur
+swat
+swig
+talk
+talkd
+tcl8.3-dev
+tcsh
+telnetd
+tk8.3-dev
+tktable-dev
+traceroute
+ttfprint
+unifont
+uw-imapd
+xcin
+xfonts-arphic-bkai00mp
+xfonts-arphic-bsmi00lp
+xfonts-arphic-gbsn00lp
+xfonts-arphic-gkai00mp
+xfonts-cmex-big5p
+xfonts-intl-chinese
+xfonts-intl-chinese-big
+yh
+yiyantang
+ytalk
+zh-autoconvert
+zsh