diff --git a/sys/amd64/conf/GENERIC-DEBUG b/sys/amd64/conf/GENERIC-DEBUG
new file mode 100644
--- /dev/null
+++ b/sys/amd64/conf/GENERIC-DEBUG
@@ -0,0 +1,4 @@
+include GENERIC
+include "std.debug"
+
+ident   GENERIC-DEBUG
diff --git a/sys/conf/std.debug b/sys/conf/std.debug
new file mode 100644
--- /dev/null
+++ b/sys/conf/std.debug
@@ -0,0 +1,28 @@
+#
+# std.debug -- Enable the debug options found in the GENERIC kernel config.
+#
+
+options	INVARIANTS
+options	INVARIANT_SUPPORT
+options	DIAGNOSTIC
+options	WITNESS
+options	WITNESS_SKIPSPIN
+options	DEBUG_VFS_LOCKS
+options	BUF_TRACKING
+options	FULL_BUF_TRACKING
+options	DEADLKRES
+options	COVERAGE
+options	KCOV
+options	MALLOC_DEBUG_MAXZONES
+options	QUEUE_MACRO_DEBUG_TRASH
+
+# Net80211 debugging
+options	IEEE80211_DEBUG
+
+# USB debugging
+options	USB_DEBUG
+options	HID_DEBUG
+
+# CAM debugging
+options	CAMDEBUG
+options	CAM_DEBUG_FLAGS