Index: release/tools/arm.subr
===================================================================
--- release/tools/arm.subr
+++ release/tools/arm.subr
@@ -65,9 +65,15 @@
 arm_create_disk() {
 	# Create the target raw file and temporary work directory.
 	chroot ${CHROOTDIR} gpart create -s ${PART_SCHEME} ${mddev}
-	chroot ${CHROOTDIR} gpart add -t '!12' -a 512k -s ${FAT_SIZE} ${mddev}
-	chroot ${CHROOTDIR} gpart set -a active -i 1 ${mddev}
-	chroot ${CHROOTDIR} newfs_msdos -L msdosboot -F ${FAT_TYPE} /dev/${mddev}s1
+	if [ "${PART_SCHEME}" == "GPT" ]; then
+		chroot ${CHROOTDIR} gpart add -t EFI -a 512k -s ${FAT_SIZE} ${mddev}
+		chroot ${CHROOTDIR} newfs_msdos -L msdosboot -F ${FAT_TYPE} -c 8 /dev/${mddev}p1
+	fi
+	if [ "${PART_SCHEME}" == "MBR" ]; then
+		chroot ${CHROOTDIR} gpart add -t '!12' -a 512k -s ${FAT_SIZE} ${mddev}
+		chroot ${CHROOTDIR} gpart set -a active -i 1 ${mddev}
+		chroot ${CHROOTDIR} newfs_msdos -L msdosboot -F ${FAT_TYPE} /dev/${mddev}s1
+	fi
 	chroot ${CHROOTDIR} gpart add -t freebsd ${mddev}
 	chroot ${CHROOTDIR} gpart create -s bsd ${mddev}s2
 	chroot ${CHROOTDIR} gpart add -t freebsd-ufs -a 64k /dev/${mddev}s2
@@ -206,7 +212,12 @@
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
-	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	if [ "${PART_SCHEME}" == "GPT" ]; then
+		chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}p1 ${FATMOUNT}
+	fi
+	if [ "${PART_SCHEME}" == "MBR" ]; then
+		chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	fi
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 
 	if [ "${EMBEDDED_TARGET}" == "arm" ]; then