diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 1dc9e179b0fc..f734f7891429 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -18,6 +18,8 @@
             rockchip              tags=package=runtime
             ..
         ..
+        efi
+        ..
         firmware
         ..
         loader.conf.d             tags=package=bootloader
diff --git a/usr.sbin/bsdinstall/scripts/bootconfig b/usr.sbin/bsdinstall/scripts/bootconfig
index 088d88ca9b2f..a592142d87a2 100755
--- a/usr.sbin/bsdinstall/scripts/bootconfig
+++ b/usr.sbin/bsdinstall/scripts/bootconfig
@@ -47,7 +47,7 @@ if [ `uname -m` == powerpc ]; then
 fi
 
 # Update the ESP (EFI System Partition) with the new bootloader if we have an ESP
-if [ -d "$BSDINSTALL_CHROOT/boot/efi" ]; then
+if [ -n "$(awk '{if ($2=="/boot/efi") printf("%s\n",$1);}' $PATH_FSTAB)" ]; then
 	case $(uname -m) in
 	    arm64)	ARCHBOOTNAME=aa64 ;;
 	    amd64)	ARCHBOOTNAME=x64 ;;