diff --git a/BuildLiveCD b/BuildLiveCD
index 0714c66b..5ce6c76a 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -54,6 +54,21 @@ done
 if [ -z "$SUITES" ]; then
     echo "No valid suites to build for" >&2 && exit 1
 fi
+for s in $SUITES; do
+    case $s in
+        dapper|edgy|feisty|gutsy|hardy)
+            ARCHARG=""
+            old_suite="yes"
+        *)
+            ARCHARG="-a$ARCH"
+            new_suite="yes"
+    esac
+done
+if [ "$new_suite" = "yes" ] && [ "$old_suite" = "yes" ]; then
+    echo "Can't build images for suites older than intrepid and suites" >&2
+    echo "greater than hardy at the same time, please use two invocations" >&2
+    exit 1
+fi
 if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
     set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu base
     if [ "$ARCH" = "i386" ]; then
@@ -111,7 +126,7 @@ for STE in $SUITES; do
 	rm -f ${PUBDIR}latest
 	ln -sf ${PUBDIR}${NOW} ${PUBDIR}latest
 	mkdir -p ${PUBDIR}${NOW}
-	if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && /usr/sbin/livecd.sh ${SUBARCHARG} ${PROPOSED} -d${STE} -a${ARCH} $arg" > ${LOG} 2>&1; then
+	if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && /usr/sbin/livecd.sh ${SUBARCHARG} ${PROPOSED} -d${STE} ${ARCHARG} $arg" > ${LOG} 2>&1; then
 	    rm -f ${PUBDIR}current
 	    ln -sf ${NOW} ${PUBDIR}current
 
diff --git a/debian/changelog b/debian/changelog
index 62a3edc7..4b9b544a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (0.58) intrepid; urgency=low
+
+  * Fix up BuildLiveCD to only pass -a$ARCH when building for intrepid,
+    and to disallow multi-suite builds (does anyone use it for this) of
+    suites >= intrepid and <= hardy in the same invocation.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 02 May 2008 15:44:17 -0600
+
 livecd-rootfs (0.57) intrepid; urgency=low
 
   * Allow the user to specify the ARCH on the livecd.sh command line,