diff --git a/etc/Makefile b/etc/Makefile
index 7d3c79402254..320bdc8abc65 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -115,10 +115,6 @@ SSH=	${SRCTOP}/crypto/openssh/ssh_config \
 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
diff --git a/usr.sbin/nscd/Makefile b/usr.sbin/nscd/Makefile
index 96a2e8a8f457..0a3af09ac2ac 100644
--- a/usr.sbin/nscd/Makefile
+++ b/usr.sbin/nscd/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+CONFS=	nscd.conf
 PROG=	nscd
 MAN=	nscd.conf.5 nscd.8
 
diff --git a/etc/nscd.conf b/usr.sbin/nscd/nscd.conf
similarity index 100%
rename from etc/nscd.conf
rename to usr.sbin/nscd/nscd.conf