diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE
index 12b82909560..48d79340631 100644
--- a/sys/arm/conf/BEAGLEBONE
+++ b/sys/arm/conf/BEAGLEBONE
@@ -28,11 +28,6 @@ include 	"../ti/am335x/std.am335x"
 
 makeoptions	MODULES_EXTRA="dtb/am335x am335x_dmtpps"
 
-# DTrace support
-options 	KDTRACE_HOOKS		# Kernel DTrace hooks
-options 	DDB_CTF			# all architectures - kernel ELF linker loads CTF data
-makeoptions	WITH_CTF=1
-
 options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM
diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6
index b022ab59691..8e5df24ae12 100644
--- a/sys/arm/conf/std.armv6
+++ b/sys/arm/conf/std.armv6
@@ -38,3 +38,8 @@ options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	VFP			# Enable floating point hardware support
 
 options 	ARM_NEW_PMAP		# Use new pmap code.
+
+# DTrace support
+options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+options 	DDB_CTF			# all architectures - kernel ELF linker loads CTF data
+makeoptions	WITH_CTF=1