diff --git a/BuildLiveCD b/BuildLiveCD
index f2706e09..83ec12a5 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -36,7 +36,7 @@ LIVE_BUILD=false
 UBUNTU_DEFAULTS_LOCALE=""
 
 while getopts :A:s:r:d:f:pa:lu: name; do case $name in
-    A)  ARCH="$OPTARG";;
+    A)	ARCH="$OPTARG";;
     s)	SUBARCH="$OPTARG";;
     r)	SUBPROJECT="$OPTARG";;
     d)	NEWSUITE="$OPTARG";;
@@ -169,17 +169,19 @@ for STE in $SUITES; do
 	done
 
 	for f in ${PUBDIR}${NOW}/livecd.*.cloop-*; do 
-	    target=${f%-*}
-	    if [ ! -f ${target} ]; then
-		for fsbs in 4096:4096 1024:65536; do
-		    if [ -f ${target}-${fsbs} ]; then
-			ln -sf ${target##*/}-${fsbs} ${target}
-			break
-		    fi
-		done
+	    if [ -f ${f} ]; then
+		target=${f%-*}
 		if [ ! -f ${target} ]; then
-		    best=$(ls -ld ${target}-* | sort -k5,5n| awk '{print $NF; quit}')
-		    ln -sf ${best##*/} ${target}
+		    for fsbs in 4096:4096 1024:65536; do
+			if [ -f ${target}-${fsbs} ]; then
+			    ln -sf ${target##*/}-${fsbs} ${target}
+			    break
+			fi
+		    done
+		    if [ ! -f ${target} ]; then
+			best=$(ls -ld ${target}-* | sort -k5,5n| awk '{print $NF; quit}')
+			ln -sf ${best##*/} ${target}
+		    fi
 		fi
 	    fi
 	done
diff --git a/debian/changelog b/debian/changelog
index 957d9109..fba1fe73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.46) precise; urgency=low
+
+  * Guard legacy cloop code in a [ -f ], so it stops failing.
+  * Don't add the LIVE_TASK for any PREINSTALLED images.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 09 Jan 2012 03:23:26 -0700
+
 livecd-rootfs (2.45) precise; urgency=low
 
   * Change default suite to precise (better late than never?)
diff --git a/live-build/auto/config b/live-build/auto/config
index 109897f0..019fff75 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -187,13 +187,9 @@ case $PROJECT in
 		;;
 esac
 
-case $SUBPROJECT in
-	wubi)
-		;;
-	*)
-		add_task live "$LIVE_TASK"
-		;;
-esac
+if [ "$PREINSTALLED" = "true" ]; then
+	add_task live "$LIVE_TASK"
+fi
 
 case $PROJECT in
 	ubuntu-dvd)