diff --git a/BuildLiveCD b/BuildLiveCD
index 43634dc1..d84e6ec1 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -144,7 +144,7 @@ for STE in $SUITES; do
 	if ! $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && SUITE=${STE} PROJECT=${FS} ARCH=${ARCH} SUBARCH=${SUBARCH} IMAGEFORMAT=${IMAGEFORMAT} lb config" >> ${LOG} 2>&1; then
 	    exit 1
 	fi
-	COMMAND="PROJECT=${FS} SUBARCH=${SUBARCH} lb build"
+	COMMAND="PROJECT=${FS} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
     else
 	COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
     fi
diff --git a/live-build/auto/build b/live-build/auto/build
index ac8a7611..19ef2a58 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -83,3 +83,23 @@ if [ "$NUMFLAVOURS" = 1 ]; then
 	ln -sf "$PREFIX.kernel-$LB_LINUX_FLAVOURS" "$PREFIX.kernel"
 	ln -sf "$PREFIX.initrd-$LB_LINUX_FLAVOURS" "$PREFIX.initrd"
 fi
+
+# LTSP chroot building (only in 32bit and for Edubuntu (DVD))
+case $PROJECT in
+	edubuntu-dvd)
+		if [ "$ARCH" = i386 ]; then
+			echo "Building LTSP chroot"
+			ltsp-build-client --base $(pwd) --mirror $LB_PARENT_MIRROR_BOOTSTRAP --arch $ARCH --dist $LB_PARENT_DISTRIBUTION --chroot ltsp-live --late-packages ldm-edubuntu-theme,plymouth-theme-edubuntu --purge-chroot --skipimage
+			mkdir -p images
+			mksquashfs ltsp-live images/ltsp-live.img -noF -noD -noI -no-exports -e cdrom
+			rm -Rf ltsp-live
+			if [ -f images/ltsp-live.img ]; then
+				mv images/ltsp-live.img livecd.$PROJECT-ltsp.squashfs
+				chmod 0644 livecd.$PROJECT-ltsp.squashfs
+				rmdir --ignore-fail-on-non-empty images
+			else
+				echo "LTSP: Unable to build the chroot, see above for details."
+			fi
+		fi
+		;;
+esac