Index: sys/amd64/conf/GENERIC-NODEBUG
===================================================================
--- sys/amd64/conf/GENERIC-NODEBUG
+++ sys/amd64/conf/GENERIC-NODEBUG
@@ -27,17 +27,6 @@
 # $FreeBSD$
 
 include GENERIC
+include "../../conf/std.nodebug"
 
 ident   GENERIC-NODEBUG
-
-nooptions       INVARIANTS
-nooptions       INVARIANT_SUPPORT
-nooptions       WITNESS
-nooptions       WITNESS_SKIPSPIN
-nooptions       BUF_TRACKING
-nooptions       DEADLKRES
-nooptions       FULL_BUF_TRACKING
-nooptions	COVERAGE
-nooptions	KCOV
-nooptions	MALLOC_DEBUG_MAXZONES
-nooptions	QUEUE_MACRO_DEBUG_TRASH
Index: sys/arm/conf/GENERIC-NODEBUG
===================================================================
--- sys/arm/conf/GENERIC-NODEBUG
+++ sys/arm/conf/GENERIC-NODEBUG
@@ -27,12 +27,6 @@
 # $FreeBSD$
 
 include GENERIC
+include "../../conf/std.nodebug"
 
 ident   GENERIC-NODEBUG
-
-nooptions       INVARIANTS
-nooptions       INVARIANT_SUPPORT
-nooptions       WITNESS
-nooptions       WITNESS_SKIPSPIN
-nooptions       DEADLKRES
-nooptions	MALLOC_DEBUG_MAXZONES
Index: sys/arm64/conf/GENERIC-NODEBUG
===================================================================
--- sys/arm64/conf/GENERIC-NODEBUG
+++ sys/arm64/conf/GENERIC-NODEBUG
@@ -27,16 +27,6 @@
 # $FreeBSD$
 
 include GENERIC
+include "../../conf/std.nodebug"
 
 ident   GENERIC-NODEBUG
-
-nooptions       INVARIANTS
-nooptions       INVARIANT_SUPPORT
-nooptions       WITNESS
-nooptions       WITNESS_SKIPSPIN
-nooptions       DEADLKRES
-nooptions       USB_DEBUG
-nooptions       HID_DEBUG
-nooptions	COVERAGE
-nooptions	KCOV
-nooptions	MALLOC_DEBUG_MAXZONES
Index: sys/conf/std.nodebug
===================================================================
--- /dev/null
+++ sys/conf/std.nodebug
@@ -0,0 +1,23 @@
+#
+# std.nodebug -- Disable the debug options found in the GENERIC kernel config.
+#
+
+nooptions       INVARIANTS
+nooptions       INVARIANT_SUPPORT
+nooptions       WITNESS
+nooptions       WITNESS_SKIPSPIN
+nooptions       BUF_TRACKING
+nooptions       FULL_BUF_TRACKING
+nooptions       DEADLKRES
+nooptions	COVERAGE
+nooptions	KCOV
+nooptions	MALLOC_DEBUG_MAXZONES
+nooptions	QUEUE_MACRO_DEBUG_TRASH
+
+# USB debugging
+nooptions       USB_DEBUG
+nooptions       HID_DEBUG
+
+# CAM debugging
+nooptions	CAMDEBUG
+nooptions	CAM_DEBUG_FLAGS
Index: sys/i386/conf/GENERIC-NODEBUG
===================================================================
--- sys/i386/conf/GENERIC-NODEBUG
+++ sys/i386/conf/GENERIC-NODEBUG
@@ -27,12 +27,6 @@
 # $FreeBSD$
 
 include GENERIC
+include "../../conf/std.nodebug"
 
 ident   GENERIC-NODEBUG
-
-nooptions       INVARIANTS
-nooptions       INVARIANT_SUPPORT
-nooptions       WITNESS
-nooptions       WITNESS_SKIPSPIN
-nooptions       DEADLKRES
-nooptions	MALLOC_DEBUG_MAXZONES
Index: sys/powerpc/conf/GENERIC-NODEBUG
===================================================================
--- sys/powerpc/conf/GENERIC-NODEBUG
+++ sys/powerpc/conf/GENERIC-NODEBUG
@@ -27,12 +27,6 @@
 # $FreeBSD$
 
 include GENERIC
+include "../../conf/std.nodebug"
 
 ident   GENERIC-NODEBUG
-
-nooptions       INVARIANTS
-nooptions       INVARIANT_SUPPORT
-nooptions       WITNESS
-nooptions       WITNESS_SKIPSPIN
-nooptions       DEADLKRES
-nooptions	MALLOC_DEBUG_MAXZONES
Index: sys/riscv/conf/GENERIC-NODEBUG
===================================================================
--- sys/riscv/conf/GENERIC-NODEBUG
+++ sys/riscv/conf/GENERIC-NODEBUG
@@ -27,16 +27,6 @@
 # $FreeBSD$
 
 include GENERIC
+include "../../conf/std.nodebug"
 
 ident   GENERIC-NODEBUG
-
-nooptions       INVARIANTS
-nooptions       INVARIANT_SUPPORT
-nooptions       WITNESS
-nooptions       WITNESS_SKIPSPIN
-nooptions       BUF_TRACKING
-nooptions       DEADLKRES
-nooptions       FULL_BUF_TRACKING
-nooptions	COVERAGE
-nooptions	KCOV
-nooptions	MALLOC_DEBUG_MAXZONES