diff --git a/etc/Makefile b/etc/Makefile
index d2c74a73fa7f..2cbdbe5b491d 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -214,9 +214,6 @@ distribution:
 	${_+_}cd ${.CURDIR}/ntp; ${MAKE} install
 .endif
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
-.if ${MK_PKGBOOTSTRAP} != "no"
-	${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
-.endif
 	${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
 	${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
 	${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
diff --git a/etc/pkg/Makefile b/etc/pkg/Makefile
deleted file mode 100644
index abc8c64ca5cb..000000000000
--- a/etc/pkg/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-NO_OBJ=
-
-FILES=	FreeBSD.conf
-
-FILESDIR=	/etc/pkg
-FILESMODE=	644
-
-.include <bsd.prog.mk>
diff --git a/etc/pkg/FreeBSD.conf b/usr.sbin/pkg/FreeBSD.conf
similarity index 100%
rename from etc/pkg/FreeBSD.conf
rename to usr.sbin/pkg/FreeBSD.conf
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile
index 145523d4bf2b..6ca341f0ad4e 100644
--- a/usr.sbin/pkg/Makefile
+++ b/usr.sbin/pkg/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+CONFS=	FreeBSD.conf
+CONFSDIR=	/etc/pkg
+CONFSMODE=	644
 PROG=	pkg
 SRCS=	pkg.c dns_utils.c config.c
 MAN=	pkg.7