diff --git a/tasks/Debian_woody b/tasks/Debian_woody
index 83e2acfb..a3f10453 100644
--- a/tasks/Debian_woody
+++ b/tasks/Debian_woody
@@ -15,6 +15,8 @@
 #include <base-woody>
 #include <forcd1>
 
+#include <pine>
+
 #include <task-woody>
 
 #include <xservers-XFree3>
@@ -23,10 +25,13 @@
 
 #include <interesting-fromcd23>
 
+/* To ensure that the kernel images are on CD2 */
+#include <unexclude-CD2-woody>
+
 /* List of packages that may still fit on the first CD */
 #include <linuxtag2000>
 
-#include <popularity-contest-woody>
+/*#include <popularity-contest-woody>*/
 
 /* Other packages to put on the others CDs */
 
diff --git a/tasks/task-woody b/tasks/task-woody
index 39bf2620..eddd5ae4 100644
--- a/tasks/task-woody
+++ b/tasks/task-woody
@@ -1,146 +1,86 @@
 /* This files lists the packages that have a Task: field
- * and that should be included on CD1
+ * and that should be included on CDs 1 and 2
  *
  * The content should be regenerated from time to time. A command line
  * similar to this one can be used :
  *
- * apt-cache dumpavail | grep-dctrl -e .+ -n -F Task -s Package
+ * cat task.list | while read LINE; do \
+ * apt-cache dumpavail | grep-dctrl -F Task $LINE -n -s Package;done > \
+ * ./task-woody
  *
- * Last update: 2002-03-07
+ * To be run from ../tasks.  task.list lists the tasks in the order they are to 
+ * be included on the CDs.
+ *
+ * Last update: 2002-05-04
  *
  */
 
-abiword
-ami
-ami-gnome
+x-window-system
 anacron
-analog
-apache
 apmd
-ark
-armagetron
-asiya24-vfont
-autoconf
-automake
-autoproject
-bg5ps
-bibindex
-bibtool
-binutils
-bison
-blt-dev
-bsdgames
-c2man
-canna
-canna-utils
-cce
-cflow
-chdrv
-chinput
-cjk-latex
-console-cyrillic
-cpanel
-cpp
-cutils
-cvs
-cxref
-dbskkd-cdb
-ddd
-debian-zh-faq-s
-debian-zh-faq-t
+irda-common
+irda-tools
+netenv
+noflushd
+pcmcia-cs
+toshutils
+anacron
 diald
-ding
-doc-debian-fr
-doc-debian-ja
-doc-debian-ko
-doc-linux-de
-doc-linux-es
-doc-linux-fr
-doc-linux-ja-text
-doc-linux-pl
-doc-linux-pl-html
-doc-linux-text-ko
-doc-linux-zh
-doc-linux-zh-s
-dvidvi
-egg
-emacs20
-esound
-exim
 fetchmail
+isdnutils
+leafnode
+lftp
+ppp
+pppconfig
+pppoe
+wvdial
+wwwoffle
+gs
+lpr
+magicfilter
+samba
+samba-doc
+smbclient
+smbfs
+swat
+bsdgames
+emacs20
 finger
 fingerd
-flex
-fonty
-fortune-zh
-freewnn-jserver
-ftnchek
 ftpd
-fweb
-g++
-g77
-gadfly
-gcc
-gdb
+man-db
+manpages
+mtr
+netcat
+nethack
+pdksh
+screen
+ssh
+talk
+talkd
+tcsh
+telnet
+telnetd
+traceroute
+ytalk
+zsh
+analog
+apache
+abiword
+ark
+esound
 gdm
-gettext
-gimp-python
 gimp1.2
-glibc-doc
 gmc
 gnome-applets
-gnome-card-games
 gnome-control-center
-gnome-gnomine
 gnome-help
 gnome-panel
 gnome-session
 gnome-terminal
 gnome-users-guide
 gnome-utils
-gnuplot
-gperiodic
-grace
-gs
-gv
-hanterm
-hlatex
-hlatex-fonts-base
-htmlgen
-hyperlatex
-idle
-ifrench-gut
-igerman
 imlib-base
-indent
-ingerman
-inn2
-ipolish
-irda-common
-irda-tools
-irussian
-isdnutils
-ispanish
-itcl3.1-dev
-itk3.1-dev
-ja-trans
-jfbterm
-junior-arcade
-junior-art
-junior-doc
-junior-games-card
-junior-games-gl
-junior-games-net
-junior-games-sim
-junior-games-text
-junior-math
-junior-programming
-junior-puzzle
-junior-sound
-junior-system
-junior-toys
-junior-typing
-junior-writing
 kab
 karm
 kate
@@ -149,8 +89,6 @@ kcharselect
 kcoloredit
 kcron
 kde
-kde-i18n-zhcngb2312
-kde-i18n-zhtwbig5
 kdebase
 kdebase-audiolibs
 kdebase-doc
@@ -168,7 +106,6 @@ kfract
 kghostview
 khexedit
 kiconedit
-kinput2-canna-wnn
 kit
 kjots
 kmail
@@ -176,13 +113,10 @@ knewsticker
 knode
 knotes
 koffice
-kon2
 konqueror
 konsole
-konwert
 korganizer
 korn
-koules
 kpackage
 kpaint
 kpm
@@ -191,67 +125,112 @@ kscreensaver
 ksirc
 ksnapshot
 ksysv
-kterm
 ktimer
 kuser
 kview
-lacheck
-language-env
-latex2html
-leafnode
-lftp
 libarts
 libkmid
 libkonq3
-libtool
-lincity-x
-liwc
-locales
-lpr
-ltrace
-lv
-magicfilter
+menu
+mozilla
+mozilla-psm
+sawfish-gnome
+secpolicy
+x-window-system
+x-window-system-core
+nfs-kernel-server
+samba
+samba-doc
+smbclient
+smbfs
+swat
+bind9
+bind9-doc
+dlint
+dnsutils
+lwresd
+exim
 mailagent
 mailx
+procmail
+qpopper
+uw-imapd
+inn2
+autoconf
+automake
+autoproject
+binutils
+bison
+c2man
+cflow
+cpp
+cutils
+cvs
+cxref
+flex
+g++
+gcc
+gdb
+gettext
+glibc-doc
+indent
+libtool
+liwc
+ltrace
 make
-man-db
-manpages
-manpages-de
 manpages-dev
-manpages-es
-manpages-fr
-manpages-ja
-manpages-ko
-manpages-pl
-manpages-pl-dev
-manpages-ru
-manpages-zh
-menu
 metrics
-mpage
-mtr
-mueller7-dict
-netcat
-netenv
-nethack
-nfs-kernel-server
-nkf
-noflushd
 nowebm
-octave2.0
 patch
-pcmcia-cs
-pdksh
+stl-manual
+strace
+junior-arcade
+junior-art
+junior-doc
+junior-games-card
+junior-games-gl
+junior-games-net
+junior-games-sim
+junior-games-text
+junior-internet
+junior-math
+junior-programming
+junior-puzzle
+junior-sound
+junior-system
+junior-toys
+junior-typing
+junior-writing
+armagetron
+bsdgames
+gnome-card-games
+gnome-gnomine
+koules
+lincity-x
+nethack
+xgalaga
+xscavenger
+xtris
+gnuplot
+gperiodic
+grace
+octave2.0
 pdl
 plotutils
-ppp
-pppconfig
-pppoe
-procmail
-psfontmgr
-pstoedit
-psutils
-pydict
+r-base
+rasmol
+yorick
+libecpg3
+pgaccess
+postgresql
+postgresql-client
+postgresql-contrib
+postgresql-doc
+ddd
+gadfly
+gimp-python
+htmlgen
+idle
 python-bobo
 python-bobopos
 python-dev
@@ -274,78 +253,153 @@ python-newt
 python-numeric
 python-numeric-tutorial
 python-pmw
+python-pygresql
 python-tk
 python-xml
-qpopper
-r-base
-rasmol
-re
-rxvt-ml
-samba
-samba-doc
-sawfish-gnome
-scalable-cyrfonts-x11
-screen
-secpolicy
-skk
-skkinput
-slatec
-smbclient
-smbfs
-stardic
-stl-manual
-strace
-swat
-talk
-talkd
+blt-dev
+itcl3.1-dev
+itk3.1-dev
 tcl8.3-dev
-tcsh
-telnet
-telnetd
+tk8.3-dev
+tktable-dev
+ftnchek
+fweb
+g77
+slatec
+bibindex
+bibtool
+dvidvi
+gv
+hyperlatex
+lacheck
+latex2html
+mpage
+pstoedit
+psutils
 tetex-base
 tetex-bin
 tetex-doc
 tetex-extra
-tfm-arphic-bkai00mp
-tfm-arphic-bsmi00lp
-tfm-arphic-gbsn00lp
-tfm-arphic-gkai00mp
-tk8.3-dev
-tktable-dev
-toshutils
-traceroute
-trans-de-en
-ttf-arphic-bkai00mp
-ttf-arphic-bsmi00lp
-ttf-arphic-gbsn00lp
-ttf-arphic-gkai00mp
-ttf-xtt-wadalab-gothic
-ttf-xtt-watanabe-mincho
-ttfprint
-unifont
 untex
-user-de
-user-es
-uw-imapd
-watanabe-vfont
-wfrench
-wgerman
-wngerman
-wpolish
-wspanish
-wvdial
-wwwoffle
-x-ttcidfont-conf
-x-window-system
-x-window-system-core
-xcin
 xfig
-xfonts-a12k12
-xfonts-baekmuk
-xfonts-base
+doc-linux-pl
+doc-linux-pl-html
+fonty
+ipolish
+konwert
+language-env
+locales
+manpages-pl
+manpages-pl-dev
+wpolish
 xfonts-biznet-iso-8859-2-100dpi
 xfonts-biznet-iso-8859-2-75dpi
 xfonts-biznet-iso-8859-2-base
+console-cyrillic
+irussian
+konwert
+language-env
+locales
+manpages-ru
+mueller7-dict
+re
+xfonts-bolkhov-koi8r-75dpi
+xfonts-bolkhov-koi8r-misc
+xfonts-cronyx-koi8r-100dpi
+xfonts-intl-european
+doc-linux-es
+ispanish
+language-env
+locales
+manpages-es
+user-es
+wspanish
+ding
+doc-linux-de
+igerman
+ingerman
+language-env
+locales
+manpages-de
+trans-de-en
+user-de
+wgerman
+wngerman
+asiya24-vfont
+canna
+canna-utils
+dbskkd-cdb
+doc-debian-ja
+doc-linux-ja-text
+egg
+freewnn-jserver
+ja-trans
+jfbterm
+kinput2-canna-wnn
+kterm
+language-env
+locales
+lv
+manpages-ja
+nkf
+skk
+skkinput
+ttf-xtt-wadalab-gothic
+ttf-xtt-watanabe-mincho
+watanabe-vfont
+xfonts-a12k12
+xfonts-base
+xfonts-intl-japanese
+xfonts-intl-japanese-big
+xfonts-kappa20
+xfonts-marumoji
+xfonts-shinonome
+xmanpages-ja
+yc-el
+ami
+ami-gnome
+doc-debian-ko
+doc-linux-text-ko
+hlatex
+hlatex-fonts-base
+locales
+manpages-ko
+xfonts-baekmuk
+bg5ps
+cce
+chinput
+cjk-latex
+cpanel
+debian-zh-faq-s
+doc-linux-zh-s
+fortune-zh
+jfbterm
+kde-i18n-zhcngb2312
+kon2
+language-env
+locales
+manpages-zh
+psfontmgr
+pydict
+rxvt-ml
+stardic
+tfm-arphic-gbsn00lp
+tfm-arphic-gkai00mp
+ttf-arphic-gbsn00lp
+ttf-arphic-gkai00mp
+unifont
+x-ttcidfont-conf
+xcin
+xfonts-intl-chinese
+xfonts-intl-chinese-big
+yh
+yiyantang
+zh-autoconvert
+zhcon
+console-cyrillic
+konwert
+language-env
+scalable-cyrfonts-x11
 xfonts-bolkhov-cp1251-75dpi
 xfonts-bolkhov-cp1251-misc
 xfonts-bolkhov-koi8r-75dpi
@@ -359,25 +413,39 @@ xfonts-cronyx-isocyr-misc
 xfonts-cronyx-koi8r-100dpi
 xfonts-cronyx-koi8u-100dpi
 xfonts-cyrillic
-xfonts-intl-chinese
-xfonts-intl-chinese-big
-xfonts-intl-european
-xfonts-intl-japanese
-xfonts-intl-japanese-big
-xfonts-kappa20
-xfonts-marumoji
-xfonts-shinonome
-xgalaga
-xmanpages-ja
-xscavenger
-xtel
-xtris
 xxkb
-yc-el
+doc-debian-fr
+doc-linux-fr
+ifrench-gut
+language-env
+manpages-fr
+wfrench
+xfonts-intl-european
+xtel
+bg5ps
+chinput
+cjk-latex
+cpanel
+debian-zh-faq-t
+fortune-zh
+kde-i18n-zhtwbig5
+language-env
+locales
+manpages-zh
+psfontmgr
+pydict
+rxvt-ml
+stardic
+tfm-arphic-bkai00mp
+tfm-arphic-bsmi00lp
+ttf-arphic-bkai00mp
+ttf-arphic-bsmi00lp
+ttfprint
+unifont
+x-ttcidfont-conf
+xcin
+xfonts-intl-chinese
 yh
 yiyantang
-yorick
-ytalk
 zh-autoconvert
 zhcon
-zsh