diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 13c82b55b1ca..db8d07d10b3c 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -98,6 +98,7 @@ options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel
 options 	DEVICE_NUMA		# I/O Device Affinity
+options 	EARLY_AP_STARTUP
 
 # CPU frequency control
 device		cpufreq
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index f30fd8e9c53f..faa35807f5fc 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -94,6 +94,7 @@ options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel
 options 	DEVICE_NUMA		# I/O Device Affinity
+options 	EARLY_AP_STARTUP
 
 # CPU frequency control
 device		cpufreq
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index bdf215a9ca03..cbb15a91933e 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -96,6 +96,7 @@ options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 # To make an SMP kernel, the next two lines are needed
 options 	SMP			# Symmetric MultiProcessor Kernel
 device		apic			# I/O APIC
+options 	EARLY_AP_STARTUP
 
 # CPU frequency control
 device		cpufreq