diff --git a/src/etc/pfSense-ddb.conf b/src/etc/pfSense-ddb.conf
new file mode 100644
index 0000000000..a793705c65
--- /dev/null
+++ b/src/etc/pfSense-ddb.conf
@@ -0,0 +1,15 @@
+# $FreeBSD$
+#
+#  This file is read when going to multi-user and its contents piped thru
+#  ``ddb'' to define debugging scripts.
+#
+# see ``man 4 ddb'' and ``man 8 ddb'' for details.
+#
+
+script lockinfo=show locks; show alllocks; show lockedvnods
+
+# kdb.enter.panic	panic(9) was called.
+script kdb.enter.panic=textdump set; capture on; run lockinfo; show pcpu; bt; ps; alltrace; capture off; call doadump; reset
+
+# kdb.enter.witness	witness(4) detected a locking error.
+script kdb.enter.witness=run lockinfo
diff --git a/src/etc/pfSense-rc b/src/etc/pfSense-rc
index 783b5a6685..80b7193388 100755
--- a/src/etc/pfSense-rc
+++ b/src/etc/pfSense-rc
@@ -57,7 +57,7 @@ echo "Configuring crash dumps..."
 
 # Setup ddb on all platforms.
 if [ ! -z "`sysctl -Nq debug.ddb.scripting.scripts`" ]; then
-	/sbin/ddb /etc/ddb.conf
+	/sbin/ddb /etc/${product}-ddb.conf
 fi
 
 fsck_forced_iterations=`/bin/kenv pfsense.fsck.force`