Index: release/amd64/make-memstick.sh
===================================================================
--- release/amd64/make-memstick.sh
+++ release/amd64/make-memstick.sh
@@ -36,11 +36,24 @@
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 
+
+dd if=/dev/zero of=efiboot.img bs=1k count=33292
+device=`mdconfig -a -t vnode -f efiboot.img`
+newfs_msdos -F 32 -c 1 -L EFISYS /dev/$device
+mkdir efi
+mount -t msdosfs /dev/$device efi
+mkdir -p efi/efi/boot
+cp -p "${1}/boot/loader.efi" efi/efi/boot/bootx64.efi
+umount efi
+rmdir efi
+mdconfig -d -u $device
+
 mkimg -s mbr \
     -b ${1}/boot/mbr \
-    -p efi:=${1}/boot/boot1.efifat \
+    -p efi:=efiboot.img \
     -p freebsd:-"mkimg -s bsd -b ${1}/boot/boot -p freebsd-ufs:=${2}.part" \
     -a 2 \
     -o ${2}
+rm efiboot.img
 rm ${2}.part
 
Index: release/arm64/make-memstick.sh
===================================================================
--- release/arm64/make-memstick.sh
+++ release/arm64/make-memstick.sh
@@ -36,9 +36,23 @@
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 
+
+dd if=/dev/zero of=efiboot.img bs=1k count=33292
+device=`mdconfig -a -t vnode -f efiboot.img`
+newfs_msdos -F 32 -c 1 -L EFISYS /dev/$device
+mkdir efi
+mount -t msdosfs /dev/$device efi
+mkdir -p efi/efi/boot
+cp -p "${1}/boot/loader.efi" efi/efi/boot/bootaa64.efi
+umount efi
+rmdir efi
+mdconfig -d -u $device
+
+
 mkimg -s gpt \
-    -p efi:=${1}/boot/boot1.efifat \
+    -p efi:=efiboot.img \
     -p freebsd:=${2}.part \
     -o ${2}
+rm efiboot.img
 rm ${2}.part
 
Index: release/i386/make-memstick.sh
===================================================================
--- release/i386/make-memstick.sh
+++ release/i386/make-memstick.sh
@@ -36,9 +36,23 @@
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 
+
+dd if=/dev/zero of=efiboot.img bs=1k count=33292
+device=`mdconfig -a -t vnode -f efiboot.img`
+newfs_msdos -F 32 -c 1 -L EFISYS /dev/$device
+mkdir efi
+mount -t msdosfs /dev/$device efi
+mkdir -p efi/efi/boot
+cp -p "${1}/boot/loader.efi" efi/efi/boot/bootia32.efi
+umount efi
+rmdir efi
+mdconfig -d -u $device
+
 mkimg -s mbr \
     -b ${1}/boot/mbr \
+    -p efi:=efiboot.img
     -p freebsd:-"mkimg -s bsd -b ${1}/boot/boot -p freebsd-ufs:=${2}.part" \
     -o ${2}
+rm efiboot.img
 rm ${2}.part
 
Index: stand/efi/boot1/Makefile
===================================================================
--- stand/efi/boot1/Makefile
+++ stand/efi/boot1/Makefile
@@ -51,7 +51,7 @@
 .PATH:		${LDRSRC}
 CFLAGS+=	-I${LDRSRC}
 
-FILES=	boot1.efi boot1.efifat
+FILES=	boot1.efi
 FILESMODE_boot1.efi=	${BINMODE}
 
 LDSCRIPT=	${EFISRC}/loader/arch/${MACHINE}/ldscript.${MACHINE}
@@ -88,22 +88,7 @@
 		-j .rela.dyn -j .reloc -j .eh_frame \
 		--output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET}
 
-# The following inserts our objects into a template FAT file system
-# created by generate-fat.sh
 
-.include "Makefile.fat"
-
-boot1.efifat: boot1.efi
-	@set -- `ls -l ${.ALLSRC}`; \
-	x=$$(($$5-${BOOT1_MAXSIZE})); \
-	if [ $$x -ge 0 ]; then \
-	    echo "boot1 $$x bytes too large; regenerate FAT templates?" >&2 ;\
-	    exit 1; \
-	fi
-	echo ${.OBJDIR}
-	xz -d -c ${BOOTSRC}/efi/boot1/fat-${MACHINE}.tmpl.xz > ${.TARGET}
-	${DD} if=${.ALLSRC} of=${.TARGET} seek=${BOOT1_OFFSET} conv=notrunc
-
-CLEANFILES+= boot1.efi boot1.efifat
+CLEANFILES+= boot1.efi
 
 .include <bsd.prog.mk>
Index: stand/efi/boot1/Makefile.fat
===================================================================
--- stand/efi/boot1/Makefile.fat
+++ stand/efi/boot1/Makefile.fat
@@ -1,4 +0,0 @@
-# This file autogenerated by generate-fat.sh - DO NOT EDIT
-# $FreeBSD$
-BOOT1_OFFSET=0x2d
-BOOT1_MAXSIZE=393216
Index: stand/efi/boot1/generate-fat.sh
===================================================================
--- stand/efi/boot1/generate-fat.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# This script generates the dummy FAT filesystem used for the EFI boot
-# blocks. It uses newfs_msdos to generate a template filesystem with the
-# relevant interesting files. These are then found by grep, and the offsets
-# written to a Makefile snippet.
-#
-# Because it requires root, and because it is overkill, we do not
-# do this as part of the normal build. If makefs(8) grows workable FAT
-# support, this should be revisited.
-
-# $FreeBSD$
-
-FAT_SIZE=1600 			#Size in 512-byte blocks of the produced image
-
-BOOT1_OFFSET=2d
-BOOT1_SIZE=384k
-
-if [ $(id -u) != 0 ]; then
-	echo "${0##*/}: must run as root" >&2
-	exit 1
-fi
-
-# Record maximum boot1 size in bytes
-case $BOOT1_SIZE in
-*k)
-	BOOT1_MAXSIZE=$(expr ${BOOT1_SIZE%k} '*' 1024)
-	;;
-*)
-	BOOT1_MAXSIZE=$BOOT1_SIZE
-	;;
-esac
-
-echo '# This file autogenerated by generate-fat.sh - DO NOT EDIT' > Makefile.fat
-echo "# \$FreeBSD\$" >> Makefile.fat
-echo "BOOT1_OFFSET=0x$BOOT1_OFFSET" >> Makefile.fat
-echo "BOOT1_MAXSIZE=$BOOT1_MAXSIZE" >> Makefile.fat
-
-while read ARCH FILENAME; do
-	# Generate 800K FAT image
-	OUTPUT_FILE=fat-${ARCH}.tmpl
-
-	dd if=/dev/zero of=$OUTPUT_FILE bs=512 count=$FAT_SIZE
-	DEVICE=`mdconfig -a -f $OUTPUT_FILE`
-	newfs_msdos -F 12 -L EFISYS $DEVICE
-	mkdir stub
-	mount -t msdosfs /dev/$DEVICE stub
-
-	# Create and bless a directory for the boot loader
-	mkdir -p stub/efi/boot
-
-	# Make a dummy file for boot1
-	echo 'Boot1 START' | dd of=stub/efi/boot/$FILENAME cbs=$BOOT1_SIZE count=1 conv=block
-	# Provide a fallback startup.nsh
-	echo $FILENAME > stub/efi/boot/startup.nsh
-
-	umount stub
-	mdconfig -d -u $DEVICE
-	rmdir stub
-
-	# Locate the offset of the fake file
-	OFFSET=$(hd $OUTPUT_FILE | grep 'Boot1 START' | cut -f 1 -d ' ')
-
-	# Convert to number of blocks
-	OFFSET=$(echo 0x$OFFSET | awk '{printf("%x\n",$1/512);}')
-
-	# Validate the offset
-	if [ $OFFSET != $BOOT1_OFFSET ]; then
-		echo "Incorrect offset $OFFSET != $BOOT1_OFFSET" >&2
-		exit 1
-	fi
-
-	xz -f $OUTPUT_FILE
-done <<EOF
-	amd64	BOOTx64.efi
-	arm64	BOOTaa64.efi
-	arm	BOOTarm.efi
-	i386	BOOTia32.efi
-EOF
Index: tools/boot/install-boot.sh
===================================================================
--- tools/boot/install-boot.sh
+++ tools/boot/install-boot.sh
@@ -33,11 +33,11 @@
     dev=$1
     dst=$2
 
-    newfs_msdos -a 32 ${dev}
+    newfs_msdos -F 32 -c 1 ${dev}
     mntpt=$(mktemp -d /tmp/stand-test.XXXXXX)
-    mount -t msdos ${dev} ${mntpt}
-    mkdir -p ${mntpt}/efi/boot
-    cp ${dst}/boot/loader.efi ${mntpt}/efi/boot/bootx64.efi
+    mount -t msdosfs ${dev} ${mntpt}
+    mkdir -p ${mntpt}/EFI/BOOT
+    cp ${dst}/boot/loader.efi ${mntpt}/EFI/BOOT/BOOTx64.efi
     umount ${mntpt}
     rmdir ${mntpt}
 }
Index: tools/boot/rootgen.sh
===================================================================
--- tools/boot/rootgen.sh
+++ tools/boot/rootgen.sh
@@ -5,8 +5,6 @@
 passphrase=passphrase
 iterations=50000
 
-do_boot1_efi=0
-
 #
 # Builds all the bat-shit crazy combinations we support booting from,
 # at least for amd64. It assume you have a ~sane kernel in /boot/kernel
@@ -40,21 +38,17 @@
     src=$1
     dst=$2
 
-    if [ "${do_boot1_efi}" -eq 1 ]; then
-	cp ${src}/boot/boot1.efifat ${dst}
-    else
-	dd if=/dev/zero of=${dst} count=1 seek=$((100 * 1024 * 1024 / 512))
-	md=$(mdconfig -f ${dst})
-	newfs_msdos -a 32 /dev/${md}
-	mntpt=$(mktemp -d /tmp/stand-test.XXXXXX)
-	mount -t msdos /dev/${md} ${mntpt}
-#	mkdir -p ${mntpt}/efi/freebsd # not yet
-	mkdir -p ${mntpt}/efi/boot
-	cp ${src}/boot/loader.efi ${mntpt}/efi/boot/bootx64.efi
-	umount ${mntpt}
-	rmdir ${mntpt}
-	mdconfig -d -u ${md}
-    fi
+    dd if=/dev/zero of=${dst} count=1 seek=$((100 * 1024 * 1024 / 512))
+    md=$(mdconfig -f ${dst})
+    newfs_msdos -F 32 -c 2 /dev/${md}
+    mntpt=$(mktemp -d /tmp/stand-test.XXXXXX)
+    mount -t msdos /dev/${md} ${mntpt}
+#   mkdir -p ${mntpt}/efi/freebsd # not yet
+    mkdir -p ${mntpt}/efi/boot
+    cp ${src}/boot/loader.efi ${mntpt}/efi/boot/bootx64.efi
+    umount ${mntpt}
+    rmdir ${mntpt}
+    mdconfig -d -u ${md}
 }
 
 mk_nogeli_gpt_ufs_legacy() {
@@ -155,7 +149,7 @@
     dd if=/dev/zero of=${img} count=1 seek=$((200 * 1024 * 1024 / 512))
     md=$(mdconfig -f ${img})
     gpart create -s gpt ${md}
-    gpart add -t efi -s 800k -a 4k ${md}
+    gpart add -t efi -s 35M -a 4k ${md}
     gpart add -t freebsd-zfs -l root $md
     # install-boot will make this bootable
     zpool create -O mountpoint=none -R ${mntpt} ${pool} ${md}p2
@@ -193,7 +187,7 @@
     dd if=/dev/zero of=${img} count=1 seek=$((200 * 1024 * 1024 / 512))
     md=$(mdconfig -f ${img})
     gpart create -s gpt ${md}
-    gpart add -t efi -s 800k -a 4k ${md}
+    gpart add -t efi -s 35M -a 4k ${md}
     gpart add -t freebsd-boot -s 400k -a 4k	${md}	# <= ~540k
     gpart add -t freebsd-zfs -l root $md
     # install-boot will make this bootable
@@ -313,7 +307,7 @@
     dd if=/dev/zero of=${img} count=1 seek=$((200 * 1024 * 1024 / 512))
     md=$(mdconfig -f ${img})
     gpart create -s mbr ${md}
-    gpart add -t \!239 -s 800k ${md}
+    gpart add -t efi -s 35M ${md}
     gpart add -t freebsd ${md}
     gpart set -a active -i 2 ${md}
     gpart create -s bsd ${md}s2
@@ -354,7 +348,7 @@
     dd if=/dev/zero of=${img} count=1 seek=$((200 * 1024 * 1024 / 512))
     md=$(mdconfig -f ${img})
     gpart create -s mbr ${md}
-    gpart add -t \!239 -s 800k ${md}
+    gpart add -t efi -s 35M ${md}
     gpart add -t freebsd ${md}
     gpart set -a active -i 2 ${md}
     gpart create -s bsd ${md}s2
@@ -430,7 +424,7 @@
     dd if=/dev/zero of=${img} count=1 seek=$(( 200 * 1024 * 1024 / 512 ))
     md=$(mdconfig -f ${img})
     gpart create -s gpt ${md}
-    gpart add -t efi -s 800k -a 4k ${md}
+    gpart add -t efi -s 35M -a 4k ${md}
     gpart add -t freebsd-ufs -l root $md
     # install-boot will make this bootable
     echo ${passphrase} | geli init -bg -e AES-XTS -i ${iterations} -J - -l 256 -s 4096 ${md}p2
@@ -466,7 +460,7 @@
     dd if=/dev/zero of=${img} count=1 seek=$(( 200 * 1024 * 1024 / 512 ))
     md=$(mdconfig -f ${img})
     gpart create -s gpt ${md}
-    gpart add -t efi -s 800k -a 4k ${md}
+    gpart add -t efi -s 35M -a 4k ${md}
     gpart add -t freebsd-boot -s 400k -a 4k	${md}	# <= ~540k
     gpart add -t freebsd-ufs -l root $md
     # install-boot will make this bootable
@@ -547,7 +541,7 @@
     dd if=/dev/zero of=${img} count=1 seek=$(( 200 * 1024 * 1024 / 512 ))
     md=$(mdconfig -f ${img})
     gpart create -s gpt ${md}
-    gpart add -t efi -s 800k -a 4k ${md}
+    gpart add -t efi -s 35M -a 4k ${md}
     gpart add -t freebsd-zfs -l root $md
     # install-boot will make this bootable
     echo ${passphrase} | geli init -bg -e AES-XTS -i ${iterations} -J - -l 256 -s 4096 ${md}p2
@@ -590,7 +584,7 @@
     dd if=/dev/zero of=${img} count=1 seek=$(( 200 * 1024 * 1024 / 512 ))
     md=$(mdconfig -f ${img})
     gpart create -s gpt ${md}
-    gpart add -t efi -s 800k -a 4k ${md}
+    gpart add -t efi -s 35M -a 4k ${md}
     gpart add -t freebsd-boot -s 400k -a 4k	${md}	# <= ~540k
     gpart add -t freebsd-zfs -l root $md
     # install-boot will make this bootable
Index: usr.sbin/bsdinstall/partedit/gpart_ops.c
===================================================================
--- usr.sbin/bsdinstall/partedit/gpart_ops.c
+++ usr.sbin/bsdinstall/partedit/gpart_ops.c
@@ -192,7 +192,9 @@
 		for (i = 0; i < (int)nitems(items); i++) {
 			if (items[i].state == 0)
 				continue;
-			if (strcmp(items[i].name, "FAT16") == 0)
+			if (strcmp(items[i].name, "FAT32") == 0)
+				strcat(command, "-F 32 -c 1");
+			else if (strcmp(items[i].name, "FAT16") == 0)
 				strcat(command, "-F 16 ");
 			else if (strcmp(items[i].name, "FAT12") == 0)
 				strcat(command, "-F 12 ");
@@ -400,7 +402,7 @@
 		    TRUE);
 		return;
 	}
-		
+
 	bootsize = lseek(bootfd, 0, SEEK_END);
 	boot = malloc(bootsize);
 	lseek(bootfd, 0, SEEK_SET);
@@ -751,6 +753,8 @@
 		else if (strcmp("fat32", type) == 0 || strcmp("efi", type) == 0
 	     	    || strcmp("ms-basic-data", type) == 0)
 			md->fstab->fs_vfstype = strdup("msdosfs");
+			if (strcmp("efi", type) == 0)
+				md->fstab->fs_mntops = strdup("noauto");
 		else
 			md->fstab->fs_vfstype = strdup(type); /* Guess */
 		if (strcmp(type, "freebsd-swap") == 0) {
Index: usr.sbin/bsdinstall/partedit/partedit_arm64.c
===================================================================
--- usr.sbin/bsdinstall/partedit/partedit_arm64.c
+++ usr.sbin/bsdinstall/partedit/partedit_arm64.c
@@ -36,7 +36,6 @@
 
 /* EFI partition size in bytes */
 #define	EFI_BOOTPART_SIZE	(200 * 1024 * 1024)
-#define	EFI_BOOTPART_PATH	"/boot/boot1.efifat"
 
 const char *
 default_scheme(void)
@@ -81,6 +80,7 @@
 {
 
 	/* Only EFI is supported as boot partition */
+	*mountpoint = "/boot/efi";
 	return ("efi");
 }
 
@@ -95,10 +95,7 @@
 partcode_path(const char *part_type, const char *fs_type)
 {
 
-	if (strcmp(part_type, "GPT") == 0)
-		return (EFI_BOOTPART_PATH);
-
-	/* No boot partition data for non-GPT */
+	/* No boot partition data for ARM64 */
 	return (NULL);
 }
 
Index: usr.sbin/bsdinstall/partedit/partedit_x86.c
===================================================================
--- usr.sbin/bsdinstall/partedit/partedit_x86.c
+++ usr.sbin/bsdinstall/partedit/partedit_x86.c
@@ -36,7 +36,6 @@
 
 /* EFI partition size in bytes */
 #define	EFI_BOOTPART_SIZE	(200 * 1024 * 1024)
-#define	EFI_BOOTPART_PATH	"/boot/boot1.efifat"
 
 static const char *
 x86_bootmethod(void)
@@ -114,8 +113,10 @@
 bootpart_type(const char *scheme, const char **mountpoint)
 {
 
-	if (strcmp(x86_bootmethod(), "UEFI") == 0)
+	if (strcmp(x86_bootmethod(), "UEFI") == 0) {
+		*mountpoint = "/boot/efi";
 		return ("efi");
+    }
 
 	return ("freebsd-boot");
 }
@@ -141,16 +142,14 @@
 partcode_path(const char *part_type, const char *fs_type)
 {
 
-	if (strcmp(part_type, "GPT") == 0) {
-		if (strcmp(x86_bootmethod(), "UEFI") == 0)
-			return (EFI_BOOTPART_PATH);
-		else if (strcmp(fs_type, "zfs") == 0)
+	if (strcmp(part_type, "GPT") == 0 && strcmp(x86_bootmethod(), "UEFI") != 0) {
+		if (strcmp(fs_type, "zfs") == 0)
 			return ("/boot/gptzfsboot");
 		else
 			return ("/boot/gptboot");
 	}
 	
-	/* No partcode except for GPT */
+	/* No partcode except for non-UEFI GPT */
 	return (NULL);
 }
 
Index: usr.sbin/bsdinstall/scripts/bootconfig
===================================================================
--- usr.sbin/bsdinstall/scripts/bootconfig
+++ usr.sbin/bsdinstall/scripts/bootconfig
@@ -1,5 +1,6 @@
 #!/bin/sh
 #-
+# Copyright (c) 2018 Rebecca Cran
 # Copyright (c) 2017 Nathan Whitehorn
 # All rights reserved.
 #
@@ -35,6 +36,10 @@
 	fi
 fi
 
-# For new-style EFI booting, add code here
-# Add boot0cfg for MBR BIOS booting?
+# Update the ESP (EFI System Partition) with the new bootloader
+if [ `sysctl -n machdep.bootmethod` == UEFI ]; then
+	mkdir -p $BSDINSTALL_CHROOT/boot/efi/EFI/FreeBSD
+	cp $BSDINSTALL_CHROOT/boot/loader.efi $BSDINSTALL_CHROOT/boot/efi/EFI/FreeBSD
+fi
 
+# Add boot0cfg for MBR BIOS booting?