Index: head/release/tools/vmimage.subr
===================================================================
--- head/release/tools/vmimage.subr
+++ head/release/tools/vmimage.subr
@@ -30,7 +30,7 @@
 				   -p freebsd-boot/bootfs:=${BOOTFILES}/i386/gptboot/gptboot"
 			ROOTFSPART="-p freebsd-ufs/rootfs:=${VMBASE}"
 			;;
-		arm64:aarch64)
+		arm64:aarch64 | riscv:riscv64*)
 			ESP=yes
 			SCHEME=gpt
 			BOOTPARTS=
Index: head/tools/boot/install-boot.sh
===================================================================
--- head/tools/boot/install-boot.sh
+++ head/tools/boot/install-boot.sh
@@ -38,6 +38,7 @@
         arm64) echo bootaa64 ;;
         i386) echo bootia32 ;;
         arm) echo bootarm ;;
+        riscv) echo bootriscv64 ;;
         *) die "machine type $(uname -m) doesn't support UEFI" ;;
     esac
 }