Index: head/sys/amd64/conf/DEFAULTS
===================================================================
--- head/sys/amd64/conf/DEFAULTS	(revision 337966)
+++ head/sys/amd64/conf/DEFAULTS	(revision 337967)
@@ -1,24 +1,25 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
 #
 # $FreeBSD$
 
 machine		amd64
 
 # Bus support.
 device		isa
 
 # Pseudo devices.
 device		mem		# Memory and kernel memory devices
 device		io		# I/O device
 
 # UART chips on this platform
 device		uart_ns8250
 
 # Default partitioning schemes
 options 	GEOM_PART_BSD
 options 	GEOM_PART_EBR
 options 	GEOM_PART_EBR_COMPAT
 options 	GEOM_PART_MBR
+options 	GEOM_PART_GPT
 
 options 	NEW_PCIB
Index: head/sys/arm64/conf/DEFAULTS
===================================================================
--- head/sys/arm64/conf/DEFAULTS	(revision 337966)
+++ head/sys/arm64/conf/DEFAULTS	(revision 337967)
@@ -1,15 +1,16 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/arm64
 #
 # $FreeBSD$
 
 machine		arm64 aarch64
 
 # Pseudo devices.
 device		mem		# Memory and kernel memory devices
 
 # Default partitioning schemes
 options 	GEOM_PART_BSD
 options 	GEOM_PART_MBR
+options 	GEOM_PART_GPT
 
 options 	NEW_PCIB
Index: head/sys/i386/conf/DEFAULTS
===================================================================
--- head/sys/i386/conf/DEFAULTS	(revision 337966)
+++ head/sys/i386/conf/DEFAULTS	(revision 337967)
@@ -1,28 +1,29 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/i386
 #
 # $FreeBSD$
 
 machine		i386
 
 # Bus support.
 device		isa
 options 	ISAPNP
 
 # Pseudo devices.
 device		mem		# Memory and kernel memory devices
 device		io		# I/O device
 
 # UART chips on this platform
 device		uart_ns8250
 
 # Default partitioning schemes
 options 	GEOM_PART_BSD
 options 	GEOM_PART_EBR
 options 	GEOM_PART_EBR_COMPAT
 options 	GEOM_PART_MBR
+options 	GEOM_PART_GPT
 
 # enable support for native hardware
 device		atpic
 
 options 	NEW_PCIB