diff --git a/debian/changelog b/debian/changelog
index 6167c908..17a37ab0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,8 +55,13 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
     that both "<a href=" and "<A HREF=" are recognized.
   * Include busybox for architectures that use initramfs-tools; base-installer
     will try to install it.
+  * tools/update_tasks: ignore comments and blank lines in tasks.list.
+  * tasks/tasks.list
+    - add missing l10n tasks: gujarati-desktop, malayalam-desktop, tamil
+    - comment out l10n tasks for languages not supported in D-I, for
+      Icelandic, Irish, Serbian, Welsh and Xhosa
 
- -- Frans Pop <fjp@debian.org>  Thu, 13 Dec 2007 17:32:10 +0100
+ -- Frans Pop <fjp@debian.org>  Mon, 17 Dec 2007 20:54:57 +0100
 
 debian-cd (3.0.3) unstable; urgency=low
 
diff --git a/tasks/task.list b/tasks/task.list
index 3780a955..f074d590 100644
--- a/tasks/task.list
+++ b/tasks/task.list
@@ -1,3 +1,4 @@
+# Main tasks
 gnome-desktop
 desktop
 web-server
@@ -7,6 +8,9 @@ print-server
 database-server
 dns-server
 file-server
+
+# Language tasks
+# Commented out means the language is currently not supported in D-I
 arabic
 arabic-desktop
 basque-desktop
@@ -50,16 +54,17 @@ german
 german-desktop
 greek
 greek-desktop
+gujarati-desktop
 hebrew
 hebrew-desktop
 hindi
 hindi-desktop
 hungarian
 hungarian-desktop
-icelandic
-icelandic-desktop
-irish
-irish-desktop
+#icelandic
+#icelandic-desktop
+#irish
+#irish-desktop
 italian
 italian-desktop
 japanese
@@ -73,6 +78,7 @@ lithuanian
 lithuanian-desktop
 macedonian
 macedonian-desktop
+malayalam-desktop
 nepali-desktop
 northern-sami-desktop
 norwegian
@@ -89,8 +95,8 @@ romanian
 romanian-desktop
 russian
 russian-desktop
-serbian
-serbian-desktop
+#serbian
+#serbian-desktop
 slovak
 slovak-desktop
 slovenian
@@ -100,6 +106,7 @@ spanish-desktop
 swedish
 swedish-desktop
 tagalog
+tamil
 tamil-desktop
 thai
 thai-desktop
@@ -108,8 +115,10 @@ turkish-desktop
 ukrainian
 ukrainian-desktop
 vietnamese-desktop
-welsh
-welsh-desktop
-xhosa-desktop
+#welsh
+#welsh-desktop
+#xhosa-desktop
+
+# Alternative desktop environments
 kde-desktop
 xfce-desktop
diff --git a/tools/update_tasks b/tools/update_tasks
index b53901b8..a726edee 100755
--- a/tools/update_tasks
+++ b/tools/update_tasks
@@ -17,7 +17,7 @@ update_full_list () {
 	tasklist=$2
 
 	grep '\*' $file > $file.new
-	for i in $(cat $tasklist); do
+	for i in $(grep -Ev "^(#.*)?[[:space:]]*$" $tasklist); do
 		grep-aptavail -e -F Task "(^| )$i(,|$)" -s Package -n;
 	done >> $file.new
 	mv $file.new $file
@@ -29,7 +29,7 @@ update_essential_list () {
 	desktoptask=$3
 
 	grep '\*' $file > $file.new
-	for i in $(cat $tasklist); do
+	for i in $(grep -Ev "^(#.*)?[[:space:]]*$" $tasklist); do
 		if ( [ "$i" != gnome-dekstop ] &&
 		     [ "$i" != kde-desktop ] &&
 		     [ "$i" != xfce-desktop ] ) ||