diff --git a/debian/changelog b/debian/changelog
index 6b089eac..51ea01d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,6 +67,10 @@ debian-cd (2.2.26) UNRELEASED; urgency=low
     the images as well!
   * Add the build date/time into a few more places so people can see them
     more easily; add the build time into the .disk/info file.
+  * DEVEL BRANCH MERGE: Change mkisofs_opts usage: add a shell function
+    for the boot-$arch scripts to use rather than simply appending to the
+    $N.mkisofs_opts file directly. Needed for forthcoming multi-arch
+    support.
 
  -- Frans Pop <fjp@debian.org>  Thu, 23 Nov 2006 01:42:00 +0100
 
diff --git a/tools/boot/etch/boot-alpha b/tools/boot/etch/boot-alpha
index 64de1ccb..5fb5f864 100755
--- a/tools/boot/etch/boot-alpha
+++ b/tools/boot/etch/boot-alpha
@@ -83,7 +83,6 @@ if [ $NN = 1 ]; then
 2:boot/vmlinuz ramdisk_size=20480 initrd=/boot/initrd.gz root=/dev/ram devfs=mount,dall console=ttyS1
 EOF
 
-    echo -n "-cache-inodes -J -l "  > $N.mkisofs_opts
     mkdir -p boot$N/milo
     # XXX: we need to build milo first.
     #cp linload.exe ldmilo.exe boot$N/milo
@@ -95,10 +94,15 @@ EOF
     #cp -lf floppy-initrd.gz $CDDIR/install
 
     # write final lines to mkisofs_opts
-    echo -n "-alpha-boot boot/bootlx boot$N " >> $N.mkisofs_opts
-    
+    add_mkisofs_opt $N.mkisofs_opts "-J"
+    add_mkisofs_opt $N.mkisofs_opts "-cache-inodes"
+    add_mkisofs_opt $N.mkisofs_opts "-l"
+    add_mkisofs_opt $N.mkisofs_opts "-alpha-boot boot/bootlx"
+    add_mkisofs_opt $N.mkisofs_dirs "boot$N"
 else
-    echo -n "-cache-inodes -J -l "  > $N.mkisofs_opts
+    add_mkisofs_opt $N.mkisofs_opts "-J"
+    add_mkisofs_opt $N.mkisofs_opts "-cache-inodes"
+    add_mkisofs_opt $N.mkisofs_opts "-l"
 fi
 
 #install_languages $CDDIR
diff --git a/tools/boot/etch/boot-amd64 b/tools/boot/etch/boot-amd64
index ab9b2ed0..007eaf58 100755
--- a/tools/boot/etch/boot-amd64
+++ b/tools/boot/etch/boot-amd64
@@ -71,7 +71,14 @@ mkdir -p boot$N/isolinux
 cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/isolinux/
 cp -lf cdrom/vmlinuz $CDDIR/install/
 cp -lf cdrom/initrd.gz $CDDIR/install/
-echo -n "-cache-inodes -J -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " > $N.mkisofs_opts
+
+add_mkisofs_opt $N.mkisofs_opts "-J"
+add_mkisofs_opt $N.mkisofs_opts "-cache-inodes"
+add_mkisofs_opt $N.mkisofs_opts "-b isolinux/isolinux.bin"
+add_mkisofs_opt $N.mkisofs_opts "-c isolinux/boot.cat"
+add_mkisofs_opt $N.mkisofs_opts "-no-emul-boot"
+add_mkisofs_opt $N.mkisofs_opts "-boot-load-size 4"
+add_mkisofs_opt $N.mkisofs_opts "-boot-info-table"
 
 syslinux_files () {
 	type=$1
@@ -152,6 +159,6 @@ EOF
 fi
 
 # write final lines to mkisofs_opts
-echo -n "boot$N " >> $N.mkisofs_opts
+add_mkisofs_opt $N.mkisofs_dirs "boot$N"
 
 # th,th, thats all
diff --git a/tools/boot/etch/boot-arm b/tools/boot/etch/boot-arm
index f78b9355..b023c7ea 100755
--- a/tools/boot/etch/boot-arm
+++ b/tools/boot/etch/boot-arm
@@ -31,7 +31,7 @@ fi
 
 cd $CDDIR/..
 
-echo -J > $N.mkisofs_opts
+add_mkisofs_opt $N.mkisofs_opts "-J"
 
 # Only disk 1* bootable
 if [ $N != 1 ] && [ $N != 1_NONUS ]; then
diff --git a/tools/boot/etch/boot-hppa b/tools/boot/etch/boot-hppa
index 8c0d616f..5822c589 100755
--- a/tools/boot/etch/boot-hppa
+++ b/tools/boot/etch/boot-hppa
@@ -24,8 +24,6 @@ if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
 fi
 
-:> $1.mkisofs_opts
-
 # Only disk 1* bootable
 if [ $N != 1 -a $N != 1_NONUS ]; then
 	exit 0
@@ -55,10 +53,10 @@ install_languages "$CDROOT"
 K32=$(ls $CDROOT/install/vmlinux-*-parisc|head -1 | sed 's?^.*/install/?install/?g')
 K64=$(ls $CDROOT/install/vmlinux-*-parisc64|head -1 | sed 's?^.*/install/?install/?g')
 
-echo " -hppa-cmdline '0/vmlinux,initrd=0/ramdisk'" >> $1.mkisofs_opts
-echo " -hppa-kernel-32 $K32" >> $1.mkisofs_opts
-echo " -hppa-kernel-64 $K64" >> $1.mkisofs_opts
-echo " -hppa-bootloader install/iplboot" >> $1.mkisofs_opts
-echo " -hppa-ramdisk install/initrd.gz" >> $1.mkisofs_opts
+add_mkisofs_opt $1.mkisofs_opts "-hppa-cmdline '0/vmlinux,root=/dev/ram,initrd=0/ramdisk,ramdisk_size=$RSIZE'"
+add_mkisofs_opt $1.mkisofs_opts "-hppa-kernel-32 $K32"
+add_mkisofs_opt $1.mkisofs_opts "-hppa-kernel-64 $K64"
+add_mkisofs_opt $1.mkisofs_opts "-hppa-bootloader install/iplboot"
+add_mkisofs_opt $1.mkisofs_opts "-hppa-ramdisk install/initrd.gz"
 
 exit 0
diff --git a/tools/boot/etch/boot-i386 b/tools/boot/etch/boot-i386
index 2d6ef6cc..31070b1c 100755
--- a/tools/boot/etch/boot-i386
+++ b/tools/boot/etch/boot-i386
@@ -97,21 +97,32 @@ for image in $DISK_IMAGES $EXTRA_DISK_IMAGES; do
 done
 
 if [ "$NN" = "1" ]; then
-    echo "Using ISOLINUX boot-disks image on CD$N"
+    echo "  Using ISOLINUX boot-disks image on CD$N"
     mkdir -p boot$N/isolinux
     cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/isolinux/
     cp -lf cdrom/vmlinuz $CDDIR/install/
     cp -lf cdrom/initrd.gz $CDDIR/install/
-    echo -n "-cache-inodes -J -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " > $N.mkisofs_opts
+
+    add_mkisofs_opt $N.mkisofs_opts "-J"
+    add_mkisofs_opt $N.mkisofs_opts "-cache-inodes"
+    add_mkisofs_opt $N.mkisofs_opts "-b isolinux/isolinux.bin"
+    add_mkisofs_opt $N.mkisofs_opts "-c isolinux/boot.cat"
+    add_mkisofs_opt $N.mkisofs_opts "-no-emul-boot"
+    add_mkisofs_opt $N.mkisofs_opts "-boot-load-size 4"
+    add_mkisofs_opt $N.mkisofs_opts "-boot-info-table"
 else
     if [ -n "$THISTYPE" ]; then
-	echo "Using $THISTYPE boot-disks image on CD$N"
-	mkdir -p boot$N/boot
-	cp $THISTYPE/boot.img boot$N/boot/
-	echo -n "-cache-inodes -J -b boot/boot.img "  > $N.mkisofs_opts
+        echo "  Using $THISTYPE boot-disks image on CD$N"
+        mkdir -p boot$N/boot
+        cp $THISTYPE/boot.img boot$N/boot/
+
+        add_mkisofs_opt $N.mkisofs_opts "-J"
+        add_mkisofs_opt $N.mkisofs_opts "-cache-inodes"
+        add_mkisofs_opt $N.mkisofs_opts "-b boot/boot.img"
     else
-	mkdir boot$N
-	echo -n "-cache-inodes -J " > $N.mkisofs_opts
+        mkdir boot$N
+        add_mkisofs_opt $N.mkisofs_opts "-J"
+        add_mkisofs_opt $N.mkisofs_opts "-cache-inodes"
     fi
 fi
 
@@ -216,10 +227,11 @@ fi
 
 # write final lines to mkisofs_opts
 if [ "$NN" = "1" ]; then
-	echo -n "boot$N " >> $N.mkisofs_opts
+    add_mkisofs_opt $N.mkisofs_dirs "boot$N"
 else
 	if [ -n "$THISTYPE" ]; then
-		echo -n "-c boot/boot.catalog boot$N "  >> $N.mkisofs_opts
+        add_mkisofs_opt $N.mkisofs_opts "-c boot/boot.catalog"
+        add_mkisofs_opt $N.mkisofs_dirs "boot$N"
 	fi
 fi
 
diff --git a/tools/boot/etch/boot-ia64 b/tools/boot/etch/boot-ia64
index 620a4d0a..83db0ab0 100755
--- a/tools/boot/etch/boot-ia64
+++ b/tools/boot/etch/boot-ia64
@@ -28,7 +28,7 @@ cd $CDDIR/..
 
 # Only disc 1 bootable
 if [ $N != 1 -a $N != 1_NONUS ]; then 
-	echo "-J" > $N.mkisofs_opts
+    add_mkisofs_opt $N.mkisofs_opts "-J"
 	exit 0; 
 fi
 
@@ -52,7 +52,13 @@ install_languages $CDDIR
 
 mkdir -p boot$N/boot
 cp -f boot.img boot$N/boot/
-echo -n "-no-emul-boot -J -b boot/boot.img -c boot/boot.catalog boot$N"  > $N.mkisofs_opts
+
+add_mkisofs_opt $N.mkisofs_opts "-J"
+add_mkisofs_opt $N.mkisofs_opts "-no-emul-boot"
+add_mkisofs_opt $N.mkisofs_opts "-b boot/boot.img"
+add_mkisofs_opt $N.mkisofs_opts "-c boot/boot.catalog"
+
+add_mkisofs_opt $N.mkisofs_dirs "boot$N"
 
 # done
 
diff --git a/tools/boot/etch/boot-m68k b/tools/boot/etch/boot-m68k
index 4dcb143c..435d81fe 100755
--- a/tools/boot/etch/boot-m68k
+++ b/tools/boot/etch/boot-m68k
@@ -29,8 +29,11 @@ fi
 
 cd $CDDIR/..
 
-echo -n "--netatalk -J -hfs -probe -map $BASEDIR/data/hfs.map" \
-        > $N.mkisofs_opts
+add_mkisofs_opt $N.mkisofs_opts "-J"
+add_mkisofs_opt $N.mkisofs_opts "--netatalk"
+add_mkisofs_opt $N.mkisofs_opts "-hfs"
+add_mkisofs_opt $N.mkisofs_opts "-probe"
+add_mkisofs_opt $N.mkisofs_opts "-map $BASEDIR/data/hfs.map"
 
 # Only disk 1 bootable
 if [ $N != 1 ]; then
@@ -83,8 +86,9 @@ cd $INSTALLDIR
 if [ -f tools/cdrom/bvme6000-boot.img.gz ]; then
 	mkdir -p $CDDIR/boot1/boot
 	cp tools/cdrom/bvme6000-boot.img.gz $CDDIR/boot1/boot/boot.bin
-	echo -n " -b boot/boot.bin -c boot/boot.catalog boot1" \
-   		>> $N.mkisofs_opts
+    add_mkisofs_opt $N.mkisofs_opts "-b boot/boot.bin"
+    add_mkisofs_opt $N.mkisofs_opts "-c boot/boot.catalog"
+    add_mkisofs_opt $N.mkisofs_dirs "boot1"
 fi
 
 ##-----------------------------< end of file >------------------------------##
diff --git a/tools/boot/etch/boot-mips b/tools/boot/etch/boot-mips
index 970e9136..78f40629 100755
--- a/tools/boot/etch/boot-mips
+++ b/tools/boot/etch/boot-mips
@@ -24,7 +24,7 @@ if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
 fi
 
-echo -J > $1.mkisofs_opts
+add_mkisofs_opt $N.mkisofs_opts "-J"
 
 # Only disk 1* bootable
 if [ $N != 1 -a $N != 1_NONUS ]; then
@@ -47,7 +47,7 @@ install -m 644 -D "$DI_DIR"/r4k-ip22/cdrom-boot.img "$CDROOT"/install/r4k-ip22-b
 
 install_languages $CDROOT
 
-echo " -mips-boot install/r4k-ip22-boot.img" >> $1.mkisofs_opts
+add_mkisofs_opt $N.mkisofs_opts "-mips-boot install/r4k-ip22-boot.img"
 #r5k-ip32 has no cdrom boot image yet
 #echo " -mips-boot install/r5k-ip32-boot.img" >> $1.mkisofs_opts
 
diff --git a/tools/boot/etch/boot-mipsel b/tools/boot/etch/boot-mipsel
index baf9bd73..3514137a 100755
--- a/tools/boot/etch/boot-mipsel
+++ b/tools/boot/etch/boot-mipsel
@@ -39,7 +39,7 @@ NN=`echo $N | sed -e 's/_NONUS//'`
 
 cd $CDROOT/..
 
-echo -J > $1.mkisofs_opts
+add_mkisofs_opt $N.mkisofs_opts "-J"
 
 # Only disks 1 bootable
 if [ $NN != 1 ]; then
@@ -71,6 +71,6 @@ cp "$DI_DIR"/vmlinux-*-r4k-kn04 "$CDROOT/boot/vmlinux-r4k-kn04"
 
 install_languages $CDROOT
 
-echo -n "-mipsel-boot boot/delo.2nd" >> $1.mkisofs_opts
+add_mkisofs_opt $N.mkisofs_opts "-mipsel-boot boot/delo.2nd"
 
 exit 0
diff --git a/tools/boot/etch/boot-powerpc b/tools/boot/etch/boot-powerpc
index bf115242..b67cd520 100755
--- a/tools/boot/etch/boot-powerpc
+++ b/tools/boot/etch/boot-powerpc
@@ -27,36 +27,37 @@ fi
 
 cd $CDDIR/..
 
-# Only disk 1* bootable
-if [ $N != 1 -a $N != 1_NONUS ]; then
-    # we don't need HFS cruft on anything but CD 1
-	:> $N.mkisofs_opts
-	exit 0
-fi
-
 install_languages $CDDIR
 
-echo -n " --iso-level 2 --chrp-boot --netatalk -hfs -probe -map $BASEDIR/data/hfs.map" \
-        > $N.mkisofs_opts
+add_mkisofs_opt $N.mkisofs_opts "--iso-level 2"
+add_mkisofs_opt $N.mkisofs_opts "--chrp-boot"
+add_mkisofs_opt $N.mkisofs_opts "--netatalk"
+add_mkisofs_opt $N.mkisofs_opts "-hfs"
+add_mkisofs_opt $N.mkisofs_opts "-probe"
+add_mkisofs_opt $N.mkisofs_opts "-map $BASEDIR/data/hfs.map"
+
 # For newworld Mac booting  - Note, no spaces in volid!
-echo -n " -part -no-desktop -hfs-bless CD$N/install -hfs-volid Debian/PowerPC_${CODENAME}" \
-	>> $N.mkisofs_opts
+add_mkisofs_opt $N.mkisofs_opts "-part"
+add_mkisofs_opt $N.mkisofs_opts "-no-desktop"
+add_mkisofs_opt $N.mkisofs_opts "-hfs-bless CD$N/install"
+add_mkisofs_opt $N.mkisofs_opts "-hfs-volid Debian/PowerPC_${CODENAME}"
+
 # Recommended size for a HFS Catalog is 4 megas per giga, defaults to 4 megas
 if [ -n "$SIZELIMIT1" ];then
   if [ "$SIZELIMIT1" -gt 1000000000 ];then
     let newsize="$SIZELIMIT1"/256
-    echo -n " -hfs-parms MAX_XTCSIZE=$newsize" >> $N.mkisofs_opts
+    add_mkisofs_opt $N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize"
   fi
 else
   if [ -n "$SIZELIMIT" ];then
     if [ "$SIZELIMIT" -gt 1000000000 ];then
       let newsize="$SIZELIMIT"/256
-      echo -n " -hfs-parms MAX_XTCSIZE=$newsize" >> $N.mkisofs_opts
+      add_mkisofs_opt $N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize"
     fi
   else
     if [ -n "$DEFBINSIZE" ] && [ "$DEFBINSIZE" -gt 1000 ];then
       let newsize="$DEFBINSIZE"*4096
-      echo -n " -hfs-parms MAX_XTCSIZE=$newsize" >> $N.mkisofs_opts
+      add_mkisofs_opt $N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize"
     fi
   fi
 fi
@@ -106,7 +107,7 @@ done
 
 if [ -f powerpc/vmlinuz-prep.initrd ]; then
   # We are still missing this for prep
-  echo -n " -prep-boot install/powerpc/vmlinuz-prep.initrd" >> $CDDIR/../$N.mkisofs_opts
+  add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-prep-boot install/powerpc/vmlinuz-prep.initrd"
 fi
 
 # Copy pegasos forth script, since pegasos machines don't support yaboot yet.
diff --git a/tools/boot/etch/boot-s390 b/tools/boot/etch/boot-s390
index dda09543..f9ee2bb6 100755
--- a/tools/boot/etch/boot-s390
+++ b/tools/boot/etch/boot-s390
@@ -25,7 +25,7 @@ CDDIR=$2
 cd $CDDIR/..
 
 if [ $N != "1" ] && [ $N != "1_NONUS" ] ; then
-	echo "-J" > $N.mkisofs_opts
+    add_mkisofs_opt $N.mkisofs_opts "-J"
 	exit 0
 fi
 
@@ -91,4 +91,5 @@ cp $BASEDIR/data/$CODENAME/s390/d390* "$imagedir/"
 cp $BASEDIR/data/$CODENAME/s390/README.boot "boot$N/"
 
 # Include the boot$N/-tree into the iso-image
-echo -n "-J boot$N "  >> $N.mkisofs_opts
+add_mkisofs_opt $N.mkisofs_opts "-J"
+add_mkisofs_opt $N.mkisofs_dirs "boot$N"
diff --git a/tools/boot/etch/boot-sparc b/tools/boot/etch/boot-sparc
index 9f27a97e..d936588a 100755
--- a/tools/boot/etch/boot-sparc
+++ b/tools/boot/etch/boot-sparc
@@ -21,8 +21,6 @@ if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
 fi
 
-:> $N.mkisofs_opts
-
 # Only disc 1* bootable
 if [ $N != 1 -a $N != 1_NONUS ]; then 
 	exit 0; 
@@ -30,8 +28,8 @@ fi
 
 install_languages $CDDIR
 
-echo "-G boot1/boot/isofs.b -B ... boot1" > $N.mkisofs_opts
-rm -rf boot1
+add_mkisofs_opt $N.mkisofs_opts "-G boot1/boot/isofs.b -B ..."
+add_mkisofs_opt $N.mkisofs_dirs "boot1"
 
 inst=boot1
 
diff --git a/tools/boot/etch/common.sh b/tools/boot/etch/common.sh
index 43daebd7..915d5266 100644
--- a/tools/boot/etch/common.sh
+++ b/tools/boot/etch/common.sh
@@ -16,3 +16,14 @@ install_languages() {
     fi
 }
 
+# Add an option to the mkisofs options for this CD _only_ if it's not
+# already set. $1 is the opts file location, "$2" is the new
+# option. Call this with _logical groupings_ of options
+add_mkisofs_opt() {
+   OPTS_FILE=$1
+   NEW_OPT="$2"
+
+   if ! ( grep -q -- "$NEW_OPT" $OPTS_FILE 2>/dev/null) ; then
+       echo -n "$NEW_OPT " >> $OPTS_FILE
+   fi
+}
diff --git a/tools/make_image b/tools/make_image
index 4b93eeb7..266fd112 100755
--- a/tools/make_image
+++ b/tools/make_image
@@ -36,6 +36,7 @@ do
 	cd $dir/..
 
 	opts=`cat $DIR/$n.mkisofs_opts`
+	dirs=`cat $DIR/$n.mkisofs_dirs`
 	volid=`cat $DIR/$n.volid`
 	relname=`echo $DEBVERSION | sed -e 's/[. ]//g'`
 	DISKINFO=`cat $DIR/$n.diskinfo`
@@ -56,8 +57,8 @@ do
 	case $DOJIGDO in
 	
 		0) # No jigdo files, just straight ISO
-			echo $MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.raw $opts CD$n
-			$MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.raw $opts CD$n
+			echo $MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.raw $opts $dirs CD$n
+			$MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.raw $opts $dirs CD$n
 			;;
 
 
@@ -69,7 +70,7 @@ do
 				-jigdo-map Debian=$MIRROR/ \
 				-jigdo-exclude boot$n \
 				-md5-list $DIR/md5-check \
-				$JIGDO_OPTS $opts CD$n
+				$JIGDO_OPTS $opts $dirs CD$n
 			$MKISOFS $MKISOFS_OPTS -V "$volid" \
 				-o $OUT/$OUTFILE.raw \
 				-jigdo-jigdo $OUT/$OUTFILE.jigdo \
@@ -77,7 +78,7 @@ do
 				-jigdo-map Debian=$MIRROR/ \
 				-jigdo-exclude boot$n \
 				-md5-list $DIR/md5-check \
-				$JIGDO_OPTS $opts CD$n
+				$JIGDO_OPTS $opts $dirs CD$n
 			;;
 
 		2) # jigdo only, no ISO
@@ -88,7 +89,7 @@ do
 				-jigdo-map Debian=$MIRROR/ \
 				-jigdo-exclude boot$n \
 				-md5-list $DIR/md5-check \
-				$JIGDO_OPTS $opts CD$n
+				$JIGDO_OPTS $opts $dirs CD$n
 			$MKISOFS $MKISOFS_OPTS -V "$volid" \
 				-o /dev/null \
 				-jigdo-jigdo $OUT/$OUTFILE.jigdo \
@@ -96,7 +97,7 @@ do
 				-jigdo-map Debian=$MIRROR/ \
 				-jigdo-exclude boot$n \
 				-md5-list $DIR/md5-check \
-				$JIGDO_OPTS $opts CD$n
+				$JIGDO_OPTS $opts $dirs CD$n
 			;;
 	esac