diff --git a/tools/boot/potato/boot-powerpc b/tools/boot/potato/boot-powerpc
index fccee0c6..1e7e4b61 100755
--- a/tools/boot/potato/boot-powerpc
+++ b/tools/boot/potato/boot-powerpc
@@ -21,17 +21,31 @@ cd $CDROOT/..
 
 # Only disk 1* bootable
 if [ $N != 1 -a $N != 1_NONUS ]; then
-	echo -n "--netatalk -j -hfs -probe -map $BASEDIR/data/hfs.map" \
-	        > $N.mkisofs_opts
+    # we don't need HFS cruft on anything but CD 1
+	#echo -n "--netatalk -j -hfs -probe -map $BASEDIR/data/hfs.map" \
+	#        > $N.mkisofs_opts
+	:> $N.mkisofs_opts
 	exit 0
 fi
 
-echo -n "--netatalk -j -hfs -probe -map $BASEDIR/data/hfs.map" \
+echo -n "--netatalk -hfs -probe -map $BASEDIR/data/hfs.map" \
         > $N.mkisofs_opts
 echo -n " -prep-boot install/prep/boot.bin" >> $N.mkisofs_opts
 # For newworld Mac booting  - Note, no spaces in volid!
-echo -n " -part -no-desktop -hfs-volid Debian/PowerPC_${CODENAME}" \
-	>> $N.mkisofs_opts
+case "$MKISOFS" in
+    *mkhybrid)
+    echo -n " -part -no-desktop -hfs-volid Debian/PowerPC_${CODENAME}" \
+	    >> $N.mkisofs_opts
+    ;;
+    *mkisofs)
+    echo -n " -part -no-desktop -hfs-bless \$n/install/powermac -hfs-volid Debian/PowerPC_${CODENAME}" \
+	    >> $N.mkisofs_opts
+    ;;
+    *)
+    echo 1>&2 "Only mkhybrid or mkisofs can be used"
+    exit 1
+    ;;
+esac
 
 DISKSROOT="$MIRROR/dists/$CODENAME/main/disks-$ARCH/current"
 INSTALLDIR="$CDROOT/install"
diff --git a/tools/boot/potato/post-boot-powerpc b/tools/boot/potato/post-boot-powerpc
index bb762001..5de7c621 100755
--- a/tools/boot/potato/post-boot-powerpc
+++ b/tools/boot/potato/post-boot-powerpc
@@ -24,6 +24,13 @@ if [ $N != 1 -a $N != 1_NONUS ]; then
 	exit 0
 fi
 
-hmount $3
-hattrib -b ":install:powermac"
-humount $3
+case "$MKISOFS" in
+    *mkhybrid)
+	hmount $3
+	hattrib -b ":install:powermac"
+	humount $3
+    ;;
+    *mkisofs)
+	exit 0
+    ;;
+esac