diff --git a/etc/Makefile b/etc/Makefile
index a76b61cbb65..8c55699d562 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -22,10 +22,6 @@ BIN1=	\
 
 # NB: keep these sorted by MK_* knobs
 
-.if ${MK_LPR} != "no"
-BIN1+=	hosts.lpd printcap
-.endif
-
 .if ${MK_OPENSSL} != "no"
 SSL=	${SRCTOP}/crypto/openssl/apps/openssl.cnf
 .endif
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index af2582c4bb1..6a152c46268 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -1,6 +1,7 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+CONFS=	hosts.lpd printcap
 PROG=	lpd
 MAN=	lpd.8
 SRCS=	lpd.c printjob.c recvjob.c lpdchar.c modes.c
diff --git a/etc/hosts.lpd b/usr.sbin/lpr/lpd/hosts.lpd
similarity index 100%
rename from etc/hosts.lpd
rename to usr.sbin/lpr/lpd/hosts.lpd
diff --git a/etc/printcap b/usr.sbin/lpr/lpd/printcap
similarity index 100%
rename from etc/printcap
rename to usr.sbin/lpr/lpd/printcap