Index: etc/mtree/BSD.root.dist
===================================================================
--- etc/mtree/BSD.root.dist
+++ etc/mtree/BSD.root.dist
@@ -18,8 +18,6 @@
             rockchip              tags=package=runtime
             ..
         ..
-        efi
-        ..
         firmware
         ..
         loader.conf.d             tags=package=bootloader
@@ -37,6 +35,8 @@
     ..
     dev             mode=0555
     ..
+    efi
+    ..
     etc
         X11
         ..
Index: share/man/man7/hier.7
===================================================================
--- share/man/man7/hier.7
+++ share/man/man7/hier.7
@@ -28,7 +28,7 @@
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd January 9, 2021
+.Dd February 19, 2021
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -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