Index: head/etc/Makefile
===================================================================
--- head/etc/Makefile
+++ head/etc/Makefile
@@ -115,10 +115,6 @@
 SSL=	${SRCTOP}/crypto/openssl/apps/openssl.cnf
 .endif
 
-.if ${MK_NS_CACHING} != "no"
-BIN1+= nscd.conf
-.endif
-
 .if ${MK_PORTSNAP} != "no"
 BIN1+= portsnap.conf
 .endif
Index: head/etc/nscd.conf
===================================================================
--- head/etc/nscd.conf
+++ head/etc/nscd.conf
@@ -1,12 +0,0 @@
-#
-# Default caching daemon configuration file
-# $FreeBSD$
-#
-
-enable-cache passwd yes
-enable-cache group yes
-enable-cache hosts yes
-enable-cache services yes
-enable-cache protocols yes
-enable-cache rpc yes
-enable-cache networks yes
Index: head/usr.sbin/nscd/Makefile
===================================================================
--- head/usr.sbin/nscd/Makefile
+++ head/usr.sbin/nscd/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+CONFS=	nscd.conf
 PROG=	nscd
 MAN=	nscd.conf.5 nscd.8
 
Index: head/usr.sbin/nscd/nscd.conf
===================================================================
--- head/usr.sbin/nscd/nscd.conf
+++ head/usr.sbin/nscd/nscd.conf
@@ -0,0 +1,12 @@
+#
+# Default caching daemon configuration file
+# $FreeBSD$
+#
+
+enable-cache passwd yes
+enable-cache group yes
+enable-cache hosts yes
+enable-cache services yes
+enable-cache protocols yes
+enable-cache rpc yes
+enable-cache networks yes