diff --git a/debian/changelog b/debian/changelog
index eae77374..3c412a7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -215,7 +215,9 @@ debian-cd (3.0.0) UNRELEASED; urgency=low
     exclude groups of related packages), and EXCLUDE<m> should be used in
     preference to EXCLUDE for packages that are just being shifted to
     later in the set by using UNEXCLUDE<n>.
-
+  + Slightly change the output naming of the disc images to make it safer
+    to produce more then one type of multi-arch disc
+	
   [ Joey Hess ]
   * Added an update-tasks target to the Makefile and moved the code out of
     file header comments to there. Fix some bugs in passing.
diff --git a/tools/make_image b/tools/make_image
index 97436455..c191a809 100755
--- a/tools/make_image
+++ b/tools/make_image
@@ -64,11 +64,8 @@ do
 	relname=`echo $DEBVERSION | sed -e 's/[. ]//g'`
 	DISKINFO=`cat $DIR/$n.diskinfo`
 
-	if [ $NUM_ARCHES = 1 ] ; then
-		OUTFILE="${CDNAME:-debian}-$relname-$ARCHES-$DISKTYPE-$n"
-	else
-		OUTFILE="${CDNAME:-debian}-$relname-MULTI-$DISKTYPE-$n"
-	fi
+	ARCHLIST=`echo "$ARCHES" | tr ' ' '-'`
+	OUTFILE="${CDNAME:-debian}-$relname-$ARCHLIST-$DISKTYPE-$n"
 
 	# Clean up any old files
 	rm -f $OUT/$OUTFILE.iso $OUT/$OUTFILE.jigdo $OUT/$OUTFILE.template