diff --git a/debian/changelog b/debian/changelog
index d79a6448..bde96013 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,10 @@ debian-cd (3.0.1) UNRELEASED; urgency=low
   * Add the DEFAULT64 handling to boot-amd64 as well as boot-i386; needed
     in both so that things are setup the same regardless of the order in
     which the boot-$arch scripts are called
+  * Fix the extra_image() function in both boot-i386 and boot-amd64 to make
+    sure we don't end up overwriting extra images from one arch with those
+    from the other. Now the multi-arch netinst should work for the installgui
+    target for both arches
 
  -- Frans Pop <fjp@debian.org>  Sat, 10 Mar 2007 22:40:34 +0100
 
diff --git a/tools/boot/etch/boot-amd64 b/tools/boot/etch/boot-amd64
index da2617fe..3b187e6b 100755
--- a/tools/boot/etch/boot-amd64
+++ b/tools/boot/etch/boot-amd64
@@ -80,33 +80,29 @@ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size 4"
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-info-table"
 
 syslinux_files () {
-	type=$1
+    type=$1
 
-	mv boot$N/isolinux-amd64/f3.txt.$type boot$N/isolinux-amd64/f3.txt
-	mv boot$N/isolinux-amd64/f4.txt.$type boot$N/isolinux-amd64/f4.txt
-	mv boot$N/isolinux-amd64/isolinux.cfg.$type boot$N/isolinux-amd64/isolinux.cfg
+    mv boot$N/isolinux-amd64/f3.txt.$type boot$N/isolinux-amd64/f3.txt
+    mv boot$N/isolinux-amd64/f4.txt.$type boot$N/isolinux-amd64/f4.txt
+    mv boot$N/isolinux-amd64/isolinux.cfg.$type boot$N/isolinux-amd64/isolinux.cfg
 }
 
 extra_image () {
-	image=$1
-	dir=$(dirname "$image")
+    image=$1
+    dir=$(dirname "$image")
 
-	if [ ! -e "$image" ]; then
-		mkdir -p $dir
-		if [ ! "$DI_WWW_HOME" ];then
-			if [ ! "$DI_DIR" ];then
-				DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
-			fi
-			cp "$DI_DIR/cdrom/$image" "$image"
-		else
-			wget "$DI_WWW_HOME/cdrom/$image" -O "$image"
-		fi
+    mkdir -p $CDDIR/install.amd/$dir
+    if [ ! -e $CDDIR/install.amd/"$image" ] ; then
+	if [ ! "$DI_WWW_HOME" ] ; then
+	    if [ ! "$DI_DIR" ] ; then
+		DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+	    fi
+	    cp "$DI_DIR/cdrom/$image" $CDDIR/install.amd/"$image"
+	else
+	    wget "$DI_WWW_HOME/cdrom/$image" -O $CDDIR/install.amd/"$image"
 	fi
+    fi
 
-	if [ ! -d $CDDIR/install.amd/$dir ]; then
-		mkdir -p $CDDIR/install.amd/$dir
-	fi
-	cp -a "$image" $CDDIR/install.amd/$dir/
 }
 
 # Include Smart Boot Manager image for people where isolinux fails
@@ -118,8 +114,8 @@ cp -p $BASEDIR/data/$DI_CODENAME/README.sbm $CDDIR/install
 # Isolinux setup including config and help files comes from d-i.
 cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux-amd64/; tar zx)
 if [ -e boot$N/isolinux-amd64/f3.txt.withgtk ]; then
-	extra_image gtk/initrd.gz
-	syslinux_files withgtk
+    extra_image gtk/initrd.gz
+    syslinux_files withgtk
 fi
 rm -f boot$N/isolinux-amd64/isolinux.cfg.with* 2>/dev/null || true
 
@@ -128,9 +124,9 @@ sed -i "s|/install/|/install.amd/|" boot$N/isolinux-amd64/isolinux.cfg
 cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/isolinux/
 
 if [ -n "$KERNEL_PARAMS" ]; then
-	# Substitute custom kernel params into the isolinux config
-	# file.
-	sed -i "s|append |append $KERNEL_PARAMS |" boot$N/isolinux-amd64/isolinux.cfg
+    # Substitute custom kernel params into the isolinux config
+    # file.
+    sed -i "s|append |append $KERNEL_PARAMS |" boot$N/isolinux-amd64/isolinux.cfg
 fi
 
 if [ -n "$ISOLINUX_DEFAULT" ]; then
diff --git a/tools/boot/etch/boot-i386 b/tools/boot/etch/boot-i386
index 854cc192..c9f09ff8 100755
--- a/tools/boot/etch/boot-i386
+++ b/tools/boot/etch/boot-i386
@@ -134,25 +134,20 @@ syslinux_files () {
 }
 
 extra_image () {
-	image=$1
-	dir=$(dirname "$image")
-	
-	if [ ! -e "$image" ]; then
-		mkdir -p $dir
-		if [ ! "$DI_WWW_HOME" ];then
-			if [ ! "$DI_DIR" ];then
-			   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
-			fi
-			cp "$DI_DIR/cdrom/$image" "$image"
-		else
-			wget "$DI_WWW_HOME/cdrom/$image" -O "$image"
-		fi
+    image=$1
+    dir=$(dirname "$image")
+
+    mkdir -p $CDDIR/install.386/$dir
+    if [ ! -e $CDDIR/install.386/"$image" ] ; then
+	if [ ! "$DI_WWW_HOME" ] ; then
+	    if [ ! "$DI_DIR" ] ; then
+		DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+	    fi
+	    cp "$DI_DIR/cdrom/$image" $CDDIR/install.386/"$image"
+	else
+	    wget "$DI_WWW_HOME/cdrom/$image" -O $CDDIR/install.386/"$image"
 	fi
-	
-	if [ ! -d $CDDIR/install.386/$dir ]; then
-		mkdir -p $CDDIR/install.386/$dir
-	fi
-	cp -a "$image" $CDDIR/install.386/$dir/
+    fi
 }
 
 # Only disk one gets the extra files installed