diff --git a/etc/Makefile b/etc/Makefile
index 94c4473dbf1e..e01b2a49673f 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -305,6 +305,10 @@ distribution:
 .endif
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
+.if ${MK_PPP} != "no"
+	cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
+	    ${PPPCNF} ${DESTDIR}/etc/ppp
+.endif
 .if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${ETCMAIL} ${DESTDIR}/etc/mail
diff --git a/usr.sbin/ppp/ppp.conf b/etc/ppp/ppp.conf
similarity index 100%
rename from usr.sbin/ppp/ppp.conf
rename to etc/ppp/ppp.conf
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 1dcd3b571a05..e0772af2e53e 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -21,9 +21,6 @@ PPP_NO_PAM=
 PPP_NO_RADIUS=
 PPP_NO_SUID=
 .endif
-CONFS=	ppp.conf
-CONFSDIR=	${CONFDIR}/ppp
-CONFSMODE=	600
 
 .if ${MK_ATM} == "no"
 PPP_NO_ATM=