diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh
index caa8d4eeedff..d0918a0cb947 100644
--- a/release/amd64/mkisoimages.sh
+++ b/release/amd64/mkisoimages.sh
@@ -25,7 +25,7 @@
 
 if [ "x$1" = "x-b" ]; then
 	# This is highly x86-centric and will be used directly below.
-	bootable="-b floppies/boot.flp -c floppies/boot.catalog"
+	bootable="-b boot/cdboot -no-emul-boot"
 	shift
 else
 	bootable=""
diff --git a/release/i386/mkisoimages.sh b/release/i386/mkisoimages.sh
index caa8d4eeedff..d0918a0cb947 100644
--- a/release/i386/mkisoimages.sh
+++ b/release/i386/mkisoimages.sh
@@ -25,7 +25,7 @@
 
 if [ "x$1" = "x-b" ]; then
 	# This is highly x86-centric and will be used directly below.
-	bootable="-b floppies/boot.flp -c floppies/boot.catalog"
+	bootable="-b boot/cdboot -no-emul-boot"
 	shift
 else
 	bootable=""