diff --git a/sys/amd64/conf/GENERIC-KMSAN b/sys/amd64/conf/GENERIC-KMSAN
new file mode 100644
index 000000000000..0afbade172b4
--- /dev/null
+++ b/sys/amd64/conf/GENERIC-KMSAN
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+include GENERIC
+
+ident   GENERIC-KMSAN
+
+options 	KMSAN