diff --git a/tools/boot/install-boot.sh b/tools/boot/install-boot.sh
index 49948a1b7739..54eb6bec9760 100755
--- a/tools/boot/install-boot.sh
+++ b/tools/boot/install-boot.sh
@@ -48,7 +48,10 @@ make_esp_mbr() {
 
     s=$(find-part $dev "!239")
     if [ -z "$s" ] ; then
-	die "No ESP slice found"
+	s=$(find-part $dev "efi")
+	if [ -z "$s" ] ; then
+	    die "No ESP slice found"
+    	fi
     fi
     make_esp /dev/${dev}s${s} ${dst}
 }
@@ -149,7 +152,7 @@ boot_nogeli_mbr_zfs_legacy() {
 }
 
 boot_nogeli_mbr_zfs_uefi() {
-    make_eps_mbr $1 $2
+    make_esp_mbr $1 $2
 }
 
 boot_nogeli_mbr_zfs_both() {
diff --git a/tools/boot/rootgen.sh b/tools/boot/rootgen.sh
index eb7337ca208d..5424e21825bb 100755
--- a/tools/boot/rootgen.sh
+++ b/tools/boot/rootgen.sh
@@ -2,8 +2,8 @@
 
 # $FreeBSD$
 
-passphrase=passphrase
-iterations=50000
+passphrase=x
+iterations=5
 
 do_boot1_efi=0
 
@@ -668,7 +668,7 @@ EOF
     rm -f ${src}/etc/fstab
 }
 
-qser="-serial telnet::4444,server -nographic"
+qser="-serial telnet::4444,server -net none"
 
 # https://wiki.freebsd.org/QemuRecipes
 # aarch64
@@ -681,6 +681,7 @@ qemu_aarch64_uefi()
         -bios QEMU_EFI.fd ${qser} \
         -drive if=none,file=${img},id=hd0 \
         -device virtio-blk-device,drive=hd0" > $sh
+    chmod 755 $sh
 # https://wiki.freebsd.org/arm64/QEMU also has
 #       -device virtio-net-device,netdev=net0
 #       -netdev user,id=net0
@@ -693,6 +694,7 @@ qemu_amd64_legacy()
     sh=$2
 
     echo "qemu-system-x86_64 -m 256m --drive file=${img},format=raw ${qser}" > $sh
+    chmod 755 $sh
 }
 
 qemu_amd64_uefi()
@@ -701,6 +703,7 @@ qemu_amd64_uefi()
     sh=$2
 
     echo "qemu-system-x86_64 -m 256m -bios ~/bios/OVMF-X64.fd --drive file=${img},format=raw ${qser}" > $sh
+    chmod 755 $sh
 }
 
 qemu_amd64_both()
@@ -710,6 +713,7 @@ qemu_amd64_both()
 
     echo "qemu-system-x86_64 -m 256m --drive file=${img},format=raw ${qser}" > $sh
     echo "qemu-system-x86_64 -m 256m -bios ~/bios/OVMF-X64.fd --drive file=${img},format=raw ${qser}" >> $sh
+    chmod 755 $sh
 }
 
 # arm
@@ -722,6 +726,7 @@ qemu_i386_legacy()
     sh=$2
 
     echo "qemu-system-i386 --drive file=${img},format=raw ${qser}" > $sh
+    chmod 755 $sh
 }
 
 # Not yet supported
@@ -731,6 +736,7 @@ qemu_i386_uefi()
     sh=$2
 
     echo "qemu-system-i386 -bios ~/bios/OVMF-X32.fd --drive file=${img},format=raw ${qser}" > $sh
+    chmod 755 $sh
 }
 
 # Needs UEFI to be supported
@@ -741,6 +747,7 @@ qemu_i386_both()
 
     echo "qemu-system-i386 --drive file=${img},format=raw ${qser}" > $sh
     echo "qemu-system-i386 -bios ~/bios/OVMF-X32.fd --drive file=${img},format=raw ${qser}" >> $sh
+    chmod 755 $sh
 }
 
 make_one_image()