diff --git a/build/kernel.sh b/build/kernel.sh
index 3428132..e39683e 100644
--- a/build/kernel.sh
+++ b/build/kernel.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2014-2024 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2014-2025 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -44,16 +44,17 @@ git_version ${SRCDIR}
 KERNEL_DEBUG_SET=${SETSDIR}/kernel-dbg-${PRODUCT_VERSION}-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz
 KERNEL_RELEASE_SET=${SETSDIR}/kernel-${PRODUCT_VERSION}-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz
 
-KERNDEBUG="nomakeoptions	DEBUG"
+KERNDEBUG=default
 SRCDEBUG="WITHOUT_DEBUG_FILES=yes"
 
 if [ -n "${PRODUCT_DEBUG}" ]; then
-	KERNDEBUG="makeoptions	DEBUG=-g\noptions		INVARIANTS\noptions		INVARIANT_SUPPORT\noptions		KASSERT_PANIC_OPTIONAL"
+	KERNDEBUG=debug
 	SRCDEBUG=
 fi
 
 if [ -f "${CONFIGDIR}/${PRODUCT_KERNEL}" ]; then
-	sed -e "s/%%DEBUG%%/${KERNDEBUG}/" "${CONFIGDIR}/${PRODUCT_KERNEL}" > \
+	sed -e "/%%DEBUG%%/r ${CONFIGDIR}/kernel.${KERNDEBUG}" \
+	    "${CONFIGDIR}/${PRODUCT_KERNEL}" | grep -v %%DEBUG%% > \
 	    "${SRCDIR}/sys/${PRODUCT_TARGET}/conf/${PRODUCT_KERNEL}"
 else
 	echo ">>> Attempting to use external kernel: ${PRODUCT_KERNEL}"
diff --git a/config/25.1/kernel.debug b/config/25.1/kernel.debug
new file mode 100644
index 0000000..b413243
--- /dev/null
+++ b/config/25.1/kernel.debug
@@ -0,0 +1,6 @@
+# included from kernel.debug
+makeoptions	DEBUG=-g
+options		INVARIANTS
+options		INVARIANT_SUPPORT
+options		KASSERT_PANIC_OPTIONAL
+options 	KASAN
diff --git a/config/25.1/kernel.default b/config/25.1/kernel.default
new file mode 100644
index 0000000..b11f336
--- /dev/null
+++ b/config/25.1/kernel.default
@@ -0,0 +1,2 @@
+# included from kernel.default
+nomakeoptions	DEBUG