Index: release/tools/arm.subr
===================================================================
--- release/tools/arm.subr
+++ release/tools/arm.subr
@@ -65,13 +65,21 @@
 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
-	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
-	chroot ${CHROOTDIR} newfs -U -L rootfs /dev/${mddev}s2a
+	if [ "${PART_SCHEME}" == "GPT" ]; then
+		chroot ${CHROOTDIR} gpart add -t efi -l msdosboot -a 512k -s ${FAT_SIZE} ${mddev}
+		chroot ${CHROOTDIR} newfs_msdos -F ${FAT_TYPE} /dev/${mddev}p1
+		chroot ${CHROOTDIR} gpart add -t freebsd-ufs -l rootfs -a 64k ${mddev}
+		chroot ${CHROOTDIR} newfs -U /dev/${mddev}p2
+	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
+		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
+		chroot ${CHROOTDIR} newfs -U -L rootfs /dev/${mddev}s2a
+	fi
 
 	return 0
 }
@@ -161,7 +169,12 @@
 }
 
 arm_install_base() {
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${DESTDIR}
+	if [ "${PART_SCHEME}" == "GPT" ]; then
+		chroot ${CHROOTDIR} mount /dev/${mddev}p2 ${DESTDIR}
+	fi
+	if [ "${PART_SCHEME}" == "MBR" ]; then
+		chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${DESTDIR}
+	fi
 	eval chroot ${CHROOTDIR} make -C ${WORLDDIR} \
 		TARGET=${EMBEDDED_TARGET} \
 		TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
@@ -178,10 +191,18 @@
 
 	echo '# Custom /etc/fstab for FreeBSD embedded images' \
 		> ${CHROOTDIR}/${DESTDIR}/etc/fstab
-	echo "/dev/ufs/rootfs   /       ufs     rw      1       1" \
-		>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
-	echo "/dev/msdosfs/MSDOSBOOT /boot/msdos msdosfs rw,noatime 0 0" \
-		>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
+	if [ "${PART_SCHEME}" == "GPT" ]; then
+		echo "/dev/gpt/rootfs   /       ufs     rw      1       1" \
+			>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
+		echo "/dev/gpt/msdosboot /boot/msdos msdosfs rw,noatime 0 0" \
+			>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
+	fi
+	if [ "${PART_SCHEME}" == "MBR" ]; then
+		echo "/dev/ufs/rootfs   /       ufs     rw      1       1" \
+			>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
+		echo "/dev/msdosfs/MSDOSBOOT /boot/msdos msdosfs rw,noatime 0 0" \
+			>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
+	fi
 	echo "tmpfs /tmp tmpfs rw,mode=1777,size=50m 0 0" \
 		>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
 
@@ -206,8 +227,14 @@
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
-	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
+	if [ "${PART_SCHEME}" == "GPT" ]; then
+		chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}p1 ${FATMOUNT}
+		chroot ${CHROOTDIR} mount /dev/${mddev}p2 ${UFSMOUNT}
+	fi
+	if [ "${PART_SCHEME}" == "MBR" ]; then
+		chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+		chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
+	fi
 
 	if [ "${EMBEDDED_TARGET}" == "arm" ]; then
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \