diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index 6f35c9d32f3..6fe45445d82 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -32,8 +32,9 @@ S=	../../..
 .include "$S/conf/kern.pre.mk"
 
 DDB_ENABLED!=	grep DDB opt_ddb.h || true
+DTR_ENABLED!=	grep KDTRACE_FRAME opt_kdtrace.h || true
 HWPMC_ENABLED!=	grep HWPMC opt_hwpmc_hooks.h || true
-.if !empty(DDB_ENABLED) || !empty(HWPMC_ENABLED)
+.if !empty(DDB_ENABLED) || !empty(DTR_ENABLED) || !empty(HWPMC_ENABLED)
 CFLAGS+=	-fno-omit-frame-pointer
 .endif
 
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index b05b770875a..00faf9596cf 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -63,6 +63,7 @@ DEV_ATPIC		opt_atpic.h
 
 # Debugging
 STOP_NMI		opt_cpu.h
+KDTRACE_FRAME		opt_kdtrace.h
 
 # BPF just-in-time compiler
 BPF_JITTER		opt_bpf.h