Index: head/sbin/geom/class/part/gpart.8
===================================================================
--- head/sbin/geom/class/part/gpart.8
+++ head/sbin/geom/class/part/gpart.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 11, 2018
+.Dd June 17, 2018
 .Dt GPART 8
 .Os
 .Sh NAME
@@ -630,9 +630,11 @@
 .It Cm efi
 The system partition for computers that use the Extensible Firmware
 Interface (EFI).
-In such cases, the GPT partitioning scheme is used and the
-actual partition type for the system partition can also be specified as
-.Qq Li "!c12a7328-f81f-11d2-ba4b-00a0c93ec93b" .
+The scheme-specific types are
+.Qq Li "!239"
+for MBR, and
+.Qq Li "!c12a7328-f81f-11d2-ba4b-00a0c93ec93b"
+for GPT.
 .It Cm freebsd
 A
 .Fx
Index: head/sys/geom/part/g_part_ebr.c
===================================================================
--- head/sys/geom/part/g_part_ebr.c
+++ head/sys/geom/part/g_part_ebr.c
@@ -135,6 +135,7 @@
 	int		alias;
 } ebr_alias_match[] = {
 	{ DOSPTYP_386BSD,	G_PART_ALIAS_FREEBSD },
+	{ DOSPTYP_EFI,		G_PART_ALIAS_EFI },
 	{ DOSPTYP_FAT32,	G_PART_ALIAS_MS_FAT32 },
 	{ DOSPTYP_FAT32LBA,	G_PART_ALIAS_MS_FAT32LBA },
 	{ DOSPTYP_LINLVM,	G_PART_ALIAS_LINUX_LVM },
Index: head/sys/geom/part/g_part_mbr.c
===================================================================
--- head/sys/geom/part/g_part_mbr.c
+++ head/sys/geom/part/g_part_mbr.c
@@ -130,6 +130,7 @@
 	{ DOSPTYP_386BSD,	G_PART_ALIAS_FREEBSD },
 	{ DOSPTYP_APPLE_BOOT,	G_PART_ALIAS_APPLE_BOOT },
 	{ DOSPTYP_APPLE_UFS,	G_PART_ALIAS_APPLE_UFS },
+	{ DOSPTYP_EFI,		G_PART_ALIAS_EFI },
 	{ DOSPTYP_EXT,		G_PART_ALIAS_EBR },
 	{ DOSPTYP_EXTLBA,	G_PART_ALIAS_EBR },
 	{ DOSPTYP_FAT16,	G_PART_ALIAS_MS_FAT16 },