diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index bec191e9f55d..7bad725c9870 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -30,7 +30,7 @@ write_partition_layout() {
 				   -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=
diff --git a/tools/boot/install-boot.sh b/tools/boot/install-boot.sh
index 58ffb6987bb7..ce6e363a3067 100755
--- a/tools/boot/install-boot.sh
+++ b/tools/boot/install-boot.sh
@@ -38,6 +38,7 @@ get_uefi_bootname() {
         arm64) echo bootaa64 ;;
         i386) echo bootia32 ;;
         arm) echo bootarm ;;
+        riscv) echo bootriscv64 ;;
         *) die "machine type $(uname -m) doesn't support UEFI" ;;
     esac
 }