diff --git a/etc/Makefile b/etc/Makefile
index 0fa9ec64245e..71283a973eaa 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -121,7 +121,6 @@ distribution:
 	${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
 	${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
 	${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
-	${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
 .if ${MK_UNBOUND} != "no"
 	if [ ! -e ${DESTDIR}/etc/unbound ]; then \
 		${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
diff --git a/lib/libpam/Makefile b/lib/libpam/Makefile
index fa73b95b140d..95d922880813 100644
--- a/lib/libpam/Makefile
+++ b/lib/libpam/Makefile
@@ -25,7 +25,7 @@
 # $FreeBSD$
 
 # The modules link in libpam.  They build the static modules as well.
-SUBDIR+=	libpam modules
+SUBDIR+=	libpam modules pam.d
 SUBDIR_DEPEND_modules=	libpam
 SUBDIR+=	static_libpam
 SUBDIR_DEPEND_static_libpam= modules
diff --git a/etc/pam.d/Makefile b/lib/libpam/pam.d/Makefile
similarity index 56%
rename from etc/pam.d/Makefile
rename to lib/libpam/pam.d/Makefile
index 195274fae541..86aaacfca3c9 100644
--- a/etc/pam.d/Makefile
+++ b/lib/libpam/pam.d/Makefile
@@ -4,9 +4,8 @@
 
 NO_OBJ=
 
-FILESGROUPS=	FILES
-
-FILES=	README \
+CONFGROUPS=	CONFS
+CONFS=	README \
 	cron \
 	imap \
 	login \
@@ -15,34 +14,26 @@ FILES=	README \
 	sshd su system \
 	xdm
 
-FILESDIR=	/etc/pam.d
-FILESMODE=	644
+CONFDIR=	/etc/pam.d
+CONFSMODE_README=	444
 
 .if ${MK_AT} != "no"
-FILESGROUPS+=	AT
+CONFGROUPS+=	AT
 AT+=	atrun
 ATPACKAGE+=	at
-ATDIR=		${FILESDIR}
-ATMODE=		${FILESMODE}
 .endif
 
 .if ${MK_FTP} != "no"
-FILESGROUPS+=	FTP
+CONFGROUPS+=	FTP
 FTP+=	ftpd
 FTPPACKAGE+=	ftp
-FTPDIR=		${FILESDIR}
-FTPMODE=	${FILESMODE}
 LINKS=	${FILESDIR}/ftpd ${FILESDIR}/ftp
 .endif
 
 .if ${MK_TELNET} != "no"
-FILESGROUPS+=	TELNET
+CONFGROUPS+=	TELNET
 TELNET+=	telnetd
 TELNETPACKAGE+=	telnet
-TELNETDIR=	${FILESDIR}
-TELNETMODE=	${FILESMODE}
 .endif
 
-FILESMODE_README=	444
-
 .include <bsd.prog.mk>
diff --git a/etc/pam.d/README b/lib/libpam/pam.d/README
similarity index 100%
rename from etc/pam.d/README
rename to lib/libpam/pam.d/README
diff --git a/etc/pam.d/atrun b/lib/libpam/pam.d/atrun
similarity index 100%
rename from etc/pam.d/atrun
rename to lib/libpam/pam.d/atrun
diff --git a/etc/pam.d/convert.pl b/lib/libpam/pam.d/convert.pl
similarity index 100%
rename from etc/pam.d/convert.pl
rename to lib/libpam/pam.d/convert.pl
diff --git a/etc/pam.d/cron b/lib/libpam/pam.d/cron
similarity index 100%
rename from etc/pam.d/cron
rename to lib/libpam/pam.d/cron
diff --git a/etc/pam.d/ftpd b/lib/libpam/pam.d/ftpd
similarity index 100%
rename from etc/pam.d/ftpd
rename to lib/libpam/pam.d/ftpd
diff --git a/etc/pam.d/imap b/lib/libpam/pam.d/imap
similarity index 100%
rename from etc/pam.d/imap
rename to lib/libpam/pam.d/imap
diff --git a/etc/pam.d/login b/lib/libpam/pam.d/login
similarity index 100%
rename from etc/pam.d/login
rename to lib/libpam/pam.d/login
diff --git a/etc/pam.d/other b/lib/libpam/pam.d/other
similarity index 100%
rename from etc/pam.d/other
rename to lib/libpam/pam.d/other
diff --git a/etc/pam.d/passwd b/lib/libpam/pam.d/passwd
similarity index 100%
rename from etc/pam.d/passwd
rename to lib/libpam/pam.d/passwd
diff --git a/etc/pam.d/pop3 b/lib/libpam/pam.d/pop3
similarity index 100%
rename from etc/pam.d/pop3
rename to lib/libpam/pam.d/pop3
diff --git a/etc/pam.d/sshd b/lib/libpam/pam.d/sshd
similarity index 100%
rename from etc/pam.d/sshd
rename to lib/libpam/pam.d/sshd
diff --git a/etc/pam.d/su b/lib/libpam/pam.d/su
similarity index 100%
rename from etc/pam.d/su
rename to lib/libpam/pam.d/su
diff --git a/etc/pam.d/system b/lib/libpam/pam.d/system
similarity index 100%
rename from etc/pam.d/system
rename to lib/libpam/pam.d/system
diff --git a/etc/pam.d/telnetd b/lib/libpam/pam.d/telnetd
similarity index 100%
rename from etc/pam.d/telnetd
rename to lib/libpam/pam.d/telnetd
diff --git a/etc/pam.d/xdm b/lib/libpam/pam.d/xdm
similarity index 100%
rename from etc/pam.d/xdm
rename to lib/libpam/pam.d/xdm