diff --git a/contrib/testingcds b/contrib/testingcds
index 7dc2b5c5..b5a6404c 100644
--- a/contrib/testingcds
+++ b/contrib/testingcds
@@ -64,10 +64,12 @@ case "$INSTALLER_CD" in
         export DISKTYPE=kde-CD;;
     5)
         export DISKTYPE=xfce-CD;;
+    A)
+        export DISKTYPE=lxde-CD;;
     9)
         export OUT_TYPE=bd
         export DISKTYPE=BD;;
-    *) export DISKTYPE=CD;;
+    *)  export DISKTYPE=CD;;
 esac
 
 if [ "$OUT_TYPE"x = ""x ] ; then
@@ -91,6 +93,8 @@ elif [ "$INSTALLER_CD" = "4" ]; then
     export OFFICIAL="Official KDE CD Snapshot"
 elif [ "$INSTALLER_CD" = "5" ]; then
     export OFFICIAL="Official Xfce CD Snapshot"
+elif [ "$INSTALLER_CD" = "A" ]; then
+    export OFFICIAL="Official LXDE CD Snapshot"
 elif [ "$INSTALLER_CD" = "6" ]; then
     export OFFICIAL="Official Multi-Arch DVD"
 elif [ "$INSTALLER_CD" = "7" ]; then
diff --git a/debian/changelog b/debian/changelog
index cd8bf100..ce74f4b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,6 +71,7 @@ debian-cd (3.1.0) UNRELEASED; urgency=low
   * Indicate which tasks are "secondary" by adding a "-" suffix in task.list.*
     files instead of hardcoding it in update_tasks. Closes: #506668.
   * Update list of languages supported by tasksel and D-I for Lenny.
+  * Add support for a separate 'LXDE desktop environment' CD.
 
  -- Frans Pop <fjp@debian.org>  Fri, 05 Dec 2008 10:04:03 +0100
 
diff --git a/easy-build.sh b/easy-build.sh
index 101493b0..75b2ce46 100755
--- a/easy-build.sh
+++ b/easy-build.sh
@@ -6,7 +6,7 @@ set -e
 ## See also CONF.sh for the meaning of variables used here.
 
 show_usage() {
-	echo "Usage: $(basename $0) [-d kde|xfce] BC|NETINST|CD|DVD [<ARCH> ...]"
+	echo "Usage: $(basename $0) [-d kde|lxde|xfce] BC|NETINST|CD|DVD [<ARCH> ...]"
 }
 
 
@@ -31,7 +31,7 @@ if [ "$1" = "-d" ]; then
 		# Ignore (gnome is default)
 		shift 2
 		;;
-	    kde|xfce)
+	    kde|lxde|xfce)
 		desktop=$2
 		shift 2
 		;;
diff --git a/tasks/lenny/Debian-lxde b/tasks/lenny/Debian-lxde
new file mode 100644
index 00000000..1c85edff
--- /dev/null
+++ b/tasks/lenny/Debian-lxde
@@ -0,0 +1,18 @@
+/*
+ *
+ * This file will be used to build an official installation CD for Lenny
+ * that can be used to install the LXDE desktop environment.
+ *
+ */
+
+/* Packages that should really be on CD1 */\
+#include <debian-installer+kernel>
+#include <forcd1>
+#include <task-essential-lxde>
+
+/* Other interesting packages */
+#include <task-full-lxde>
+#include <interesting-fromcd23>
+
+/* The rest ordered by popularity */
+#include <popularity-contest>
diff --git a/tasks/lenny/task.list b/tasks/lenny/task.list
index b93dbe86..78043dec 100644
--- a/tasks/lenny/task.list
+++ b/tasks/lenny/task.list
@@ -12,3 +12,4 @@ file-server
 # Alternative desktop environments
 kde-desktop -
 xfce-desktop -
+lxde-desktop -
diff --git a/tasks/lenny/task.list.lxde b/tasks/lenny/task.list.lxde
new file mode 100644
index 00000000..fcd46d54
--- /dev/null
+++ b/tasks/lenny/task.list.lxde
@@ -0,0 +1,3 @@
+lxde-desktop
+desktop
+laptop
diff --git a/tools/update_tasks b/tools/update_tasks
index 3ee3ad2a..ed887794 100755
--- a/tools/update_tasks
+++ b/tools/update_tasks
@@ -165,7 +165,7 @@ dpkg -x $TASKSEL_DEB $TDIR/tasksel
 [ -e task.languages ] || exit 1
 grep -Ev "^(#.*)?[[:space:]]*$" task.languages > $TDIR/languages
 
-for variant in "" kde xfce; do
+for variant in "" kde lxde xfce; do
     if [ ! -e task.list${variant:+.$variant} ]; then
         echo "Warning: task.list${variant:+.$variant} does not exist; skipping"
 	continue