Index: head/etc/Makefile
===================================================================
--- head/etc/Makefile
+++ head/etc/Makefile
@@ -15,7 +15,6 @@
 BIN1=	crontab \
 	devd.conf \
 	devfs.conf \
-	ddb.conf \
 	dhclient.conf \
 	disktab \
 	fbtab \
Index: head/etc/ddb.conf
===================================================================
--- head/etc/ddb.conf
+++ head/etc/ddb.conf
@@ -1,15 +0,0 @@
-# $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
Index: head/sbin/ddb/Makefile
===================================================================
--- head/sbin/ddb/Makefile
+++ head/sbin/ddb/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+CONFS=	ddb.conf
 PACKAGE=runtime
 PROG=	ddb
 SRCS=	ddb.c ddb_capture.c ddb_script.c
Index: head/sbin/ddb/ddb.conf
===================================================================
--- head/sbin/ddb/ddb.conf
+++ head/sbin/ddb/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