Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc
+++ ObsoleteFiles.inc
@@ -36,6 +36,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 2021XXXX: ESP mount point moved from /boot/efi to /efi
+OLD_DIRS+=boot/efi
+
 # 20210302: fmtree removed
 OLD_FILES+=usr/sbin/fmtree
 OLD_FILES+=usr/share/man/man8/fmtree.8.gz
Index: release/tools/arm.subr
===================================================================
--- release/tools/arm.subr
+++ release/tools/arm.subr
@@ -184,7 +184,7 @@
 		TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
 		DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \
 		${CONF_FILES} installworld installkernel distribution
-	chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/efi
+	chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/efi
 	chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos
 
 	arm_create_user
@@ -199,7 +199,7 @@
 	if [ "${PART_SCHEME}" == "GPT" ]; then
 		echo "/dev/ufs/rootfs   /       ufs     rw      1       1" \
 			>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
-		echo "/dev/msdosfs/EFI /boot/efi msdosfs rw,noatime 0 0" \
+		echo "/dev/msdosfs/EFI /efi msdosfs rw,noatime 0 0" \
 			>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
 	fi
 	if [ "${PART_SCHEME}" == "MBR" ]; then
Index: release/tools/vmimage.subr
===================================================================
--- release/tools/vmimage.subr
+++ release/tools/vmimage.subr
@@ -235,8 +235,8 @@
 		BOOTPARTS="${BOOTPARTS} -p efi/efiesp:=${espfilename}"
 
 		# Add this to fstab
-		mkdir -p ${DESTDIR}/boot/efi
-		echo "/dev/${ROOTLABEL}/efiesp	/boot/efi       msdosfs     rw      2       2" \
+		mkdir -p ${DESTDIR}/efi
+		echo "/dev/${ROOTLABEL}/efiesp	/efi            msdosfs     rw      2       2" \
 			>> ${DESTDIR}/etc/fstab
 	fi
 
Index: share/man/man7/hier.7
===================================================================
--- share/man/man7/hier.7
+++ share/man/man7/hier.7
@@ -53,8 +53,6 @@
 .Xr fdt 4
 and
 .Xr dtc 1
-.It Pa efi/
-Mount point for EFI System Partition (ESP) on UEFI systems
 .It Pa firmware/
 loadable kernel modules containing binary firmware for hardware that needs
 firmware downloaded to it to function
@@ -91,6 +89,8 @@
 see
 .Xr \&fd 4
 .El
+.It Pa /efi/
+Mount point for EFI System Partition (ESP) on UEFI systems
 .It Pa /etc/
 system configuration files and scripts
 .Pp
Index: share/mk/bsd.own.mk
===================================================================
--- share/mk/bsd.own.mk
+++ share/mk/bsd.own.mk
@@ -56,7 +56,7 @@
 # KMODMODE	KLD mode. [${BINMODE}]
 #
 #
-# EFIDIR	Base path for the UEFI ESP [/boot/efi]
+# EFIDIR	Base path for the UEFI ESP [/efi]
 #
 # EFIOWN	EFIDIR owner. [root]
 #
@@ -178,7 +178,7 @@
 DTBOWN?=	root
 DTBGRP?=	wheel
 DTBMODE?=	444
-EFIDIR?=	/boot/efi
+EFIDIR?=	/efi
 EFIOWN?=	root
 EFIGRP?=	wheel
 EFIMODE?=	555
Index: usr.sbin/bsdinstall/partedit/partedit_efi.c
===================================================================
--- usr.sbin/bsdinstall/partedit/partedit_efi.c
+++ usr.sbin/bsdinstall/partedit/partedit_efi.c
@@ -85,7 +85,7 @@
 {
 
 	/* Only EFI is supported as boot partition */
-	*mountpoint = "/boot/efi";
+	*mountpoint = "/efi";
 	return ("efi");
 }
 
Index: usr.sbin/bsdinstall/partedit/partedit_x86.c
===================================================================
--- usr.sbin/bsdinstall/partedit/partedit_x86.c
+++ usr.sbin/bsdinstall/partedit/partedit_x86.c
@@ -114,7 +114,7 @@
 {
 
 	if (strcmp(x86_bootmethod(), "UEFI") == 0) {
-		*mountpoint = "/boot/efi";
+		*mountpoint = "/efi";
 		return ("efi");
 	}
 
Index: usr.sbin/bsdinstall/scripts/bootconfig
===================================================================
--- usr.sbin/bsdinstall/scripts/bootconfig
+++ usr.sbin/bsdinstall/scripts/bootconfig
@@ -47,7 +47,7 @@
 fi
 
 # Update the ESP (EFI System Partition) with the new bootloader if we have an ESP
-if [ -d "$BSDINSTALL_CHROOT/boot/efi" ]; then
+if [ -d "$BSDINSTALL_CHROOT/efi" ]; then
 	case $(uname -m) in
 	    arm64)	ARCHBOOTNAME=aa64 ;;
 	    amd64)	ARCHBOOTNAME=x64 ;;
@@ -60,7 +60,7 @@
 	BOOTNAME="${BOOTDIR}/boot${ARCHBOOTNAME}.efi"
 	FREEBSD_BOOTDIR="/efi/freebsd"
 	FREEBSD_BOOTNAME="${FREEBSD_BOOTDIR}/loader.efi"
-	mntpt="$BSDINSTALL_CHROOT/boot/efi"
+	mntpt="$BSDINSTALL_CHROOT/efi"
 
 	f_dprintf "Installing loader.efi onto ESP"
 	mkdir -p "${mntpt}/${FREEBSD_BOOTDIR}" "${mntpt}/${BOOTDIR}"
Index: usr.sbin/bsdinstall/scripts/zfsboot
===================================================================
--- usr.sbin/bsdinstall/scripts/zfsboot
+++ usr.sbin/bsdinstall/scripts/zfsboot
@@ -861,7 +861,7 @@
 				             "$efibootpart" \
 				             || return $FAILURE
 				f_eval_catch $funcname printf "$PRINTF_FSTAB" \
-					     $efibootpart /boot/efi msdosfs \
+					     $efibootpart /efi msdosfs \
 				             rw 2 2 "$BSDINSTALL_TMPETC/fstab" \
 				             || return $FAILURE
 			fi