diff --git a/BuildLiveCD b/BuildLiveCD
index 426f3c17..985340ce 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -116,7 +116,7 @@ for STE in $SUITES; do
     fi
 
     for arg in "$@"; do
-	PUBDIR=~/public_html/LiveCD/${STE}/${arg}${SUBARCH:+-$SUBARCH}/
+	PUBDIR=~/public_html/LiveCD/${STE}/${arg}/
 	mkdir -p ${PUBDIR}
 
 	NOW=$(date +%Y%m%d)
diff --git a/debian/changelog b/debian/changelog
index d3510b96..7217f118 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ livecd-rootfs (1.130) UNRELEASED; urgency=low
 
   * Revert to version 1.127: we do want the subarch in the filename so these
     files can coexist in the same directory, as they do for all other archs.
+  * BuildLiveCD: drop the subarch from the directory name, which has never
+    made sense; but we don't want this to go live without coordination with
+    cdimage.
 
  -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 29 Jun 2010 17:38:04 -0700