diff --git a/debian/changelog b/debian/changelog
index 27fe102a..e9cfd4e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
     linux-image-2.4-<subarch> packages for as many architectures as we can,
     instead of enumerating the versions of the kernels to include. Much
     cleaner and more robust and will make d-i more robust as well.
+  * Update task.list with new etch (and some old sarge) tasks.
+  * Update task-full-etch and improve the generation recipe.
 
   [ Sven Luther ]
   * Fixed powerpc cd builds, added powerpc64 kernels to etch/sid, dropped
diff --git a/tasks/task-full-etch b/tasks/task-full-etch
index bf9ab8e1..0bd044b0 100644
--- a/tasks/task-full-etch
+++ b/tasks/task-full-etch
@@ -4,10 +4,9 @@
  * The content should be regenerated from time to time, like this:
  *
 
-apt-cache dumpavail > dumpavail
 for i in $(cat task.list); do \
- grep-dctrl -F Task $i -s Package -n < dumpavail; done >> ./task-full-etch
-rm dumpavail
+ grep-aptavail --regex -F Task "^$i$" -s Package -n; \
+done >> ./task-full-etch
 
  *
  * The file task.list lists the tasks in the order they are to 
@@ -17,161 +16,37 @@ rm dumpavail
  *
  */
 
-bg5ps
-chinput
-cpanel
-doc-linux-ja-html
-fcitx
-fortune-mod
-gdm
+
 gimp
-gimp-help-sv
-gnome
-gnome-desktop-environment
-hspell-gui
-imhangul
-imhangul-status-applet
-kde
-kde-core
-kde-i18n-ca
-kde-i18n-da
-kde-i18n-de
-kde-i18n-el
-kde-i18n-es
-kde-i18n-fr
-kde-i18n-he
-kde-i18n-it
-kde-i18n-ja
-kde-i18n-nb
-kde-i18n-nn
-kde-i18n-pl
-kde-i18n-ptbr
-kde-i18n-ru
-kde-i18n-sv
-kde-i18n-tr
-kde-i18n-uk
-kde-i18n-zhcn
-kde-i18n-zhtw
-kdeadmin
-kdegraphics
-kdemultimedia
-kdenetwork
-kdepim
-kdeutils
-kinput2-canna-wnn
-koffice-i18n-ca
-koffice-i18n-da
-koffice-i18n-el
-koffice-i18n-he
-koffice-i18n-it
-koffice-i18n-sv
-koffice-i18n-tr
-kterm
 menu
-mlterm
-mozilla-browser
-mozilla-firefox-locale-uk
-mozilla-locale-ca
-mozilla-locale-da
-mozilla-locale-de-at
-mozilla-locale-el
-mozilla-locale-it
-mozilla-locale-ja
-mozilla-locale-ko
-mozilla-locale-ptbr
+mozilla-firefox
 mozilla-psm
-mozilla-thunderbird-locale-uk
 myspell-en-gb
 myspell-en-us
-myspell-uk
-nabi
 openoffice.org-bin
-openoffice.org-l10n-ca
-openoffice.org-l10n-da
-openoffice.org-l10n-de
-openoffice.org-l10n-el
-openoffice.org-l10n-es
-openoffice.org-l10n-fr
-openoffice.org-l10n-he
-openoffice.org-l10n-it
-openoffice.org-l10n-ja
-openoffice.org-l10n-ko
-openoffice.org-l10n-nb
-openoffice.org-l10n-nn
-openoffice.org-l10n-pl
-openoffice.org-l10n-pt-br
-openoffice.org-l10n-ru
-openoffice.org-l10n-sv
-openoffice.org-l10n-th
-openoffice.org-l10n-tr
-openoffice.org-l10n-zh-cn
-openoffice.org-l10n-zh-tw
-pydict
-rxvt-ml
-rxvt-unicode-ml
-scim-chinese
-scim-tables-zh
-stardic
-t1-cyrillic
-t1-teams
-ttf-arhangai
-ttf-arphic-bkai00mp
-ttf-arphic-bsmi00lp
-ttf-arphic-gbsn00lp
-ttf-arphic-gkai00mp
-ttf-baekmuk
-ttf-freefont
-ttf-kochi-gothic
-ttf-kochi-mincho
-ttf-thryomanes
-ttf-unfonts
-unifont
-x-ttcidfont-conf
+openoffice.org-help-en
+synaptic
+twm
 x-window-system-core
-xcin
-xfonts-a12k12
-xfonts-ayu
-xfonts-baekmuk
-xfonts-biznet-iso-8859-2-100dpi
-xfonts-biznet-iso-8859-2-75dpi
-xfonts-biznet-iso-8859-2-base
-xfonts-bolkhov-75dpi
-xfonts-bolkhov-cp1251-75dpi
-xfonts-bolkhov-cp1251-misc
-xfonts-bolkhov-koi8r-75dpi
-xfonts-bolkhov-koi8r-misc
-xfonts-bolkhov-koi8u-75dpi
-xfonts-bolkhov-koi8u-misc
-xfonts-bolkhov-misc
-xfonts-cronyx-100dpi
-xfonts-cronyx-cp1251-100dpi
-xfonts-cronyx-isocyr-100dpi
-xfonts-cronyx-isocyr-75dpi
-xfonts-cronyx-isocyr-misc
-xfonts-cronyx-koi8r-100dpi
-xfonts-cronyx-koi8u-100dpi
-xfonts-intl-chinese
-xfonts-intl-chinese-big
-xfonts-intl-european
-xfonts-intl-japanese
-xfonts-intl-japanese-big
-xfonts-kaname
-xfonts-kappa20
-xfonts-marumoji
-xfonts-mona
-xfonts-mplus
-xfonts-shinonome
-xfonts-terminus
-xmanpages-ja
+xterm
+fortune-mod
+gnome
+gnome-desktop-environment
+libtheora0
 xscreensaver
-xxkb
-kdeartwork
+analog
 apache2-doc
 apache2-mpm-prefork
 libapache2-mod-perl2
 libapache2-mod-php4
 libapache2-mod-python
-analog
+acpi
+acpid
+anacron
+apmd
+pcmcia-cs
+wireless-tools
+xfree86-driver-synaptics
 exim4
 exim4-config
 exim4-daemon-light
@@ -182,14 +57,17 @@ procmail
 qpopper
 spamassassin
 uw-imapd
-cupsys-driver-gimpprint
-foomatic-db-engine
-foomatic-db-hpijs
 cupsys
 cupsys-bsd
 cupsys-client
+cupsys-driver-gutenprint
+foomatic-db-engine
+foomatic-db-gutenprint
+foomatic-db-hpijs
 foomatic-filters-ppds
 foomatic-gui
+gimp-print
+printconf
 pgaccess
 postgresql
 postgresql-client
@@ -207,163 +85,58 @@ samba-doc
 smbclient
 smbfs
 swat
+winbind
 aspell-pt-br
 ibrazilian
-kde-i18n-ptbr
 manpages-pt
-mozilla-locale-ptbr
 myspell-pt-br
-openoffice.org-l10n-pt-br
-util-linux-locales
 kde-i18n-ptbr
 mozilla-locale-ptbr
 openoffice.org-l10n-pt-br
 aspell-ca
 icatalan
-kde-i18n-ca
-koffice-i18n-ca
-mozilla-locale-ca
 myspell-ca
-openoffice.org-l10n-ca
-util-linux-locales
 wcatalan
-language-env
 kde-i18n-ca
 koffice-i18n-ca
 mozilla-locale-ca
 openoffice.org-l10n-ca
-bg5ps
-chinput
-cpanel
 debian-zh-faq-s
+chinput
 fcitx
-fortune-zh
-jfbterm
 kde-i18n-zhcn
-mlterm
+openoffice.org-help-zh-cn
 openoffice.org-l10n-zh-cn
-rxvt-ml
-rxvt-unicode-ml
 scim-chinese
-scim-tables-zh
 stardic
 ttf-arphic-gbsn00lp
 ttf-arphic-gkai00mp
-unifont
-x-ttcidfont-conf
-xfonts-intl-chinese
 xfonts-intl-chinese-big
-zh-autoconvert
-zhcon
-language-env
-bg5ps
-chinput
-cpanel
-fcitx
-kde-i18n-zhcn
-mlterm
-openoffice.org-l10n-zh-cn
-rxvt-ml
-rxvt-unicode-ml
-scim-chinese
-scim-tables-zh
-stardic
-ttf-arphic-gbsn00lp
-ttf-arphic-gkai00mp
-unifont
-x-ttcidfont-conf
-xfonts-intl-chinese
-xfonts-intl-chinese-big
-bg5ps
-chinput
-cpanel
 debian-zh-faq-t
-fortune-zh
-jfbterm
-kde-i18n-zhtw
-mlterm
+m17n-env
+openoffice.org-help-zh-tw
 openoffice.org-l10n-zh-tw
 pydict
-rxvt-ml
-rxvt-unicode-ml
-scim-tables-zh
+scim-chewing
 ttf-arphic-bkai00mp
 ttf-arphic-bsmi00lp
-unifont
-x-ttcidfont-conf
 xcin
-xfonts-intl-chinese
-zh-autoconvert
-zhcon
-language-env
-bg5ps
-chinput
-cpanel
-kde-i18n-zhtw
-mlterm
-openoffice.org-l10n-zh-tw
-pydict
-rxvt-ml
-rxvt-unicode-ml
-scim-tables-zh
-ttf-arphic-bkai00mp
-ttf-arphic-bsmi00lp
-unifont
-x-ttcidfont-conf
-xcin
-xfonts-intl-chinese
-console-cyrillic
-konwert
 t1-cyrillic
 t1-teams
 ttf-arhangai
-ttf-thryomanes
 xfonts-bolkhov-75dpi
 xfonts-bolkhov-cp1251-75dpi
 xfonts-bolkhov-cp1251-misc
-xfonts-bolkhov-koi8r-75dpi
-xfonts-bolkhov-koi8r-misc
-xfonts-bolkhov-koi8u-75dpi
-xfonts-bolkhov-koi8u-misc
 xfonts-bolkhov-misc
 xfonts-cronyx-100dpi
 xfonts-cronyx-cp1251-100dpi
 xfonts-cronyx-isocyr-100dpi
 xfonts-cronyx-isocyr-75dpi
 xfonts-cronyx-isocyr-misc
-xfonts-cronyx-koi8r-100dpi
-xfonts-cronyx-koi8u-100dpi
-xxkb
-language-env
-t1-cyrillic
-t1-teams
-ttf-arhangai
-ttf-thryomanes
-xfonts-bolkhov-75dpi
-xfonts-bolkhov-cp1251-75dpi
-xfonts-bolkhov-cp1251-misc
-xfonts-bolkhov-koi8r-75dpi
-xfonts-bolkhov-koi8r-misc
-xfonts-bolkhov-koi8u-75dpi
-xfonts-bolkhov-koi8u-misc
-xfonts-bolkhov-misc
-xfonts-cronyx-100dpi
-xfonts-cronyx-cp1251-100dpi
-xfonts-cronyx-isocyr-100dpi
-xfonts-cronyx-isocyr-75dpi
-xfonts-cronyx-isocyr-misc
-xfonts-cronyx-koi8r-100dpi
-xfonts-cronyx-koi8u-100dpi
 xxkb
 aspell-da
 idanish
-kde-i18n-da
-koffice-i18n-da
-mozilla-locale-da
-openoffice.org-l10n-da
-util-linux-locales
 wdanish
-language-env
 kde-i18n-da
 koffice-i18n-da
 mozilla-locale-da
@@ -371,58 +144,47 @@ openoffice.org-l10n-da
 doc-debian-fr
 doc-linux-fr-text
 ifrench-gut
-kde-i18n-fr
 manpages-fr
 myspell-fr-gut
-openoffice.org-l10n-fr
 wfrench
-xfonts-intl-european
-language-env
 kde-i18n-fr
+openoffice.org-help-fr
 openoffice.org-l10n-fr
-xfonts-intl-european
 ding
 doc-linux-de
 ingerman
-kde-i18n-de
 manpages-de
-mozilla-locale-de-at
 myspell-de-at
 myspell-de-ch
 myspell-de-de
-openoffice.org-l10n-de
 trans-de-en
 wngerman
-language-env
 kde-i18n-de
 mozilla-locale-de-at
+openoffice.org-help-de
 openoffice.org-l10n-de
 kde-i18n-el
 koffice-i18n-el
+mozilla-firefox-locale-el
 mozilla-locale-el
+mozilla-thunderbird-locale-el
+myspell-el-gr
+openoffice.org-help-el
 openoffice.org-l10n-el
-ttf-freefont
-ttf-thryomanes
-xfonts-intl-european
-language-env
-kde-i18n-el
-koffice-i18n-el
-mozilla-locale-el
-openoffice.org-l10n-el
-ttf-freefont
-ttf-thryomanes
-xfonts-intl-european
+ttf-mgopen
+aspell-he
 bidiv
 culmus
 hspell
-hspell-gui
-kde-i18n-he
-koffice-i18n-he
 libfribidi0
-openoffice.org-l10n-he
+libhdate1
+myspell-he
+hdate-applet
 hspell-gui
 kde-i18n-he
 koffice-i18n-he
+mozilla-firefox-locale-he-il
+mozilla-firefox-theme-rtlclassic
 openoffice.org-l10n-he
 apt-howto-it
 aspell-it
@@ -431,59 +193,30 @@ doc-linux-it
 doc-linux-it-text
 fortunes-it
 iitalian
-kde-i18n-it
-koffice-i18n-it
 maint-guide-it
 manpages-it
-mozilla-locale-it
 myspell-it
-openoffice.org-l10n-it
 witalian
-xfonts-intl-european
-language-env
 kde-i18n-it
 koffice-i18n-it
 mozilla-locale-it
+openoffice.org-help-it
 openoffice.org-l10n-it
-xfonts-intl-european
 canna
 canna-utils
-doc-debian-ja
-doc-linux-ja-html
 doc-linux-ja-text
 egg
 ja-trans
-jfbterm
-kde-i18n-ja
-kinput2-canna-wnn
-kterm
 lv
 manpages-ja
 manpages-ja-dev
-mlterm
-mozilla-locale-ja
 nkf
-openoffice.org-l10n-ja
-ttf-kochi-gothic
-ttf-kochi-mincho
-xfonts-a12k12
-xfonts-ayu
-xfonts-intl-japanese
-xfonts-intl-japanese-big
-xfonts-kaname
-xfonts-kappa20
-xfonts-marumoji
-xfonts-mona
-xfonts-mplus
-xfonts-shinonome
-xmanpages-ja
-language-env
 doc-linux-ja-html
 kde-i18n-ja
 kinput2-canna-wnn
 kterm
-mlterm
 mozilla-locale-ja
+openoffice.org-help-ja
 openoffice.org-l10n-ja
 ttf-kochi-gothic
 ttf-kochi-mincho
@@ -498,156 +231,104 @@ xfonts-mona
 xfonts-mplus
 xfonts-shinonome
 xmanpages-ja
-doc-debian-ko
-doc-linux-text-ko
-imhangul
-imhangul-status-applet
-jfbterm
 manpages-ko
-mozilla-locale-ko
-nabi
-openoffice.org-l10n-ko
-ttf-baekmuk
-ttf-unfonts
-xfonts-baekmuk
-language-env
 imhangul
 imhangul-status-applet
 mozilla-locale-ko
 nabi
+openoffice.org-help-ko
 openoffice.org-l10n-ko
 ttf-baekmuk
 ttf-unfonts
 xfonts-baekmuk
+aspell-lt
 ilithuanian
 myspell-lt
-language-env
+openoffice.org-l10n-lt
 aspell-no
 inorwegian
-kde-i18n-nb
-kde-i18n-nn
-locales
 myspell-nb
 myspell-nn
-openoffice.org-l10n-nb
-openoffice.org-l10n-nn
-util-linux-locales
 wnorwegian
-language-env
 kde-i18n-nb
 kde-i18n-nn
 openoffice.org-l10n-nb
 openoffice.org-l10n-nn
 doc-linux-pl
 doc-linux-pl-html
-fonty
 ipolish
-kde-i18n-pl
-konwert
 manpages-pl
 manpages-pl-dev
-openoffice.org-l10n-pl
 wpolish
-xfonts-biznet-iso-8859-2-100dpi
-xfonts-biznet-iso-8859-2-75dpi
-xfonts-biznet-iso-8859-2-base
-language-env
 kde-i18n-pl
 openoffice.org-l10n-pl
-xfonts-biznet-iso-8859-2-100dpi
-xfonts-biznet-iso-8859-2-75dpi
-xfonts-biznet-iso-8859-2-base
-console-cyrillic
 irussian
-kde-i18n-ru
-konwert
 manpages-ru
 mueller7-dict
 myspell-ru
-openoffice.org-l10n-ru
 re
-xfonts-bolkhov-koi8r-75dpi
-xfonts-bolkhov-koi8r-misc
-xfonts-cronyx-koi8r-100dpi
-xfonts-intl-european
-language-env
 kde-i18n-ru
 openoffice.org-l10n-ru
-xfonts-bolkhov-koi8r-75dpi
-xfonts-bolkhov-koi8r-misc
-xfonts-cronyx-koi8r-100dpi
-xfonts-intl-european
 aspell-es
 debian-reference-es
-debrecipes-es
 doc-debian-es
-doc-es-misc
 doc-linux-es
 ispanish
-kde-i18n-es
-linux-tutorial-es
 manpages-es
 myspell-es
-openoffice.org-l10n-es
-util-linux-locales
 wspanish
-language-env
 kde-i18n-es
+openoffice.org-help-es
 openoffice.org-l10n-es
 aspell-sv
 doc-linux-sv-html
-gimp-help-sv
 iswedish
-kde-i18n-sv
-koffice-i18n-sv
-locales
 myspell-sv-se
-openoffice.org-l10n-sv
-util-linux-locales
 wswedish
 gimp-help-sv
 kde-i18n-sv
 koffice-i18n-sv
+openoffice.org-help-sv
 openoffice.org-l10n-sv
 cttex
 nonlock
-openoffice.org-l10n-th
 ttmkfdir
 xfonts-thai
 xiterm+thai
-language-env
 openoffice.org-l10n-th
-console-terminus
-kde-i18n-tr
-koffice-i18n-tr
-locales
 manpages-tr
-openoffice.org-l10n-tr
-util-linux-locales
-xfonts-terminus
-language-env
 kde-i18n-tr
 koffice-i18n-tr
 openoffice.org-l10n-tr
-xfonts-terminus
 aspell-ukr
-console-cyrillic
 iukrainian
 kde-i18n-uk
-konwert
 mozilla-firefox-locale-uk
 mozilla-thunderbird-locale-uk
 myspell-uk
-xfonts-bolkhov-koi8u-75dpi
-xfonts-bolkhov-koi8u-misc
-xfonts-cronyx-koi8u-100dpi
-xfonts-intl-european
-language-env
-kde-i18n-uk
-mozilla-firefox-locale-uk
-mozilla-thunderbird-locale-uk
-myspell-uk
-xfonts-bolkhov-koi8u-75dpi
-xfonts-bolkhov-koi8u-misc
-xfonts-cronyx-koi8u-100dpi
-xfonts-intl-european
+ttf-arabeyes
+xfonts-intl-arabic
+kde-i18n-ar
+openoffice.org-l10n-ar
+aspell-bg
+ibulgarian
+wbulgarian
+kde-i18n-bg
+myspell-bg
+iczech
+kde-i18n-cs
+mozilla-firefox-locale-cs-cz
+openoffice.org-l10n-cs
+idutch
+wdutch
+aspell-nl
+kde-i18n-nl
+mozilla-firefox-locale-nl-nl
+myspell-nl
+openoffice.org-l10n-nl
+kde-i18n-ro
+mozilla-firefox-locale-ro-ro
+ttf-dejavu
+aspell-sk
+kde-i18n-sk
+openoffice.org-l10n-sk
diff --git a/tasks/task.list b/tasks/task.list
index e0ddc933..d8232592 100644
--- a/tasks/task.list
+++ b/tasks/task.list
@@ -1,5 +1,8 @@
 desktop
+gnome-desktop
+kde-desktop
 web-server
+laptop
 mail-server
 print-server
 database-server
@@ -49,3 +52,15 @@ turkish
 turkish-desktop
 ukrainian
 ukrainian-desktop
+arabic
+arabic-desktop
+bulgarian
+bulgarian-desktop
+czech
+czech-desktop
+dutch
+dutch-desktop
+romanian
+romanian-desktop
+slovak
+slovak-desktop