Index: head/release/release.sh
===================================================================
--- head/release/release.sh
+++ head/release/release.sh
@@ -144,7 +144,7 @@
 		WITH_COMPRESSED_IMAGES=
 		NODOC=yes
 		case ${EMBEDDED_TARGET}:${EMBEDDED_TARGET_ARCH} in
-			arm:arm*|arm64:aarch64)
+			arm:arm*|arm64:aarch64|riscv:riscv64*)
 				chroot_build_release_cmd="chroot_arm_build_release"
 				;;
 			*)
@@ -400,6 +400,9 @@
 		amd64)
 			echo "bootx64.efi"
 			;;
+		riscv)
+			echo "bootriscv64.efi"
+			;;
 	esac
 }
 
@@ -407,7 +410,7 @@
 chroot_arm_build_release() {
 	load_target_env
 	case ${EMBEDDED_TARGET} in
-		arm|arm64)
+		arm|arm64|riscv)
 			if [ -e "${RELENGDIR}/tools/arm.subr" ]; then
 				. "${RELENGDIR}/tools/arm.subr"
 			fi
Index: head/release/tools/arm.subr
===================================================================
--- head/release/tools/arm.subr
+++ head/release/tools/arm.subr
@@ -27,7 +27,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# Common subroutines used to build arm SD card images.
+# Common subroutines used to build arm, arm64, or RISC-V SD card images.
 #
 # $FreeBSD$
 #
@@ -265,11 +265,11 @@
 }
 
 arm_install_uboot() {
-	# Override in the arm/KERNEL.conf file.
+	# Override in the ${EMBEDDED_TARGET}/${BOARDNAME}.conf file.
 
 	return 0
 }
 
 arm_do_quirk() {
-	# Override in the arm{,64}/BOARD.conf file.
+	# Override in the ${EMBEDDED_TARGET}/${BOARDNAME}.conf file.
 }