diff --git a/README.easy-build b/README.easy-build
index b04604a6..a8a79759 100644
--- a/README.easy-build
+++ b/README.easy-build
@@ -11,7 +11,11 @@ easy-build.sh supports the following variations:
 - businesscard, netinst and full CD images, and DVD images
 - single-architecture and multi-architecture images
 - optionally include source packages
-- select to install GNOME (default), KDE or Xfce desktops as desktop task
+- select to install GNOME (default), KDE, LXDE or Xfce desktops as desktop
+  task
+- create a combined LXDE/Xfce "light desktop" CD
+- create a businesscard or netinst CD, or DVD set supporting all four
+  desktop environments
 - creates ISO files by default; creating jigdo files is possible
 - specify which Debian release to use
 - include custom versions of packages (debs)
diff --git a/easy-build.sh b/easy-build.sh
index 0760044e..aaacb024 100755
--- a/easy-build.sh
+++ b/easy-build.sh
@@ -131,16 +131,28 @@ case $DISKTYPE in
 	;;
 esac
 
-# By default a GNOME CD/DVD is built, but KDE and Xfce are supported too
-if [ "$desktop" ] && ([ $DISKTYPE = CD ] || [ $DISKTYPE = DVD ]); then
-	TASK=Debian-$desktop
+# By default a GNOME CD/DVD is built, but other desktops are supported too
+if [ "$desktop" ]; then
+	if [ ! -e tasks/$CODENAME/task.list.$desktop ]; then
+		echo "Error: desktop '$desktop' is not supported for $CODENAME"
+		exit 1
+	fi
+	if [ "$desktop" = all ] && [ $DISKTYPE = CD ]; then
+		echo
+		echo "WARNING: CD1 by itself can never support installing all desktops!"
+		echo
+	fi
+
+	if [ $DISKTYPE != BC ] && [ $DISKTYPE != NETINST ]; then
+		export TASK=Debian-$desktop
+	fi
 	if [ "$CODENAME" = etch ]; then
 		KERNEL_PARAMS="tasks=\"$desktop-desktop, standard\""
 	else
 		KERNEL_PARAMS="desktop=$desktop"
 	fi
 	DESKTOP=$desktop
-	export TASK KERNEL_PARAMS DESKTOP
+	export KERNEL_PARAMS DESKTOP
 fi
 
 if [ "$LOCAL" ] && [ "$UPDATE_LOCAL" ]; then