diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile
index ebec3a793c7..51a2195fe59 100644
--- a/etc/pam.d/Makefile
+++ b/etc/pam.d/Makefile
@@ -8,13 +8,11 @@ FILESGROUPS=	FILES
 
 FILES=	README \
 	cron \
-	ftpd \
 	imap \
 	login \
 	other \
 	passwd pop3 \
 	sshd su system \
-	telnetd \
 	xdm
 
 FILESDIR=	/etc/pam.d
@@ -28,6 +26,15 @@ ATDIR=		${FILESDIR}
 ATMODE=		${FILESMODE}
 .endif
 
+.if ${MK_FTP} != "no"
+FILESGROUPS+=	FTP
+FTP+=	ftpd
+FTPPACKAGE+=	ftp
+FTPDIR=		${FILESDIR}
+FTPMODE=	${FILESMODE}
+LINKS=	${FILESDIR}/ftpd ${FILESDIR}/ftp
+.endif
+
 .if ${MK_RCMDS} != "no"
 FILESGROUPS+=	RCMDS
 RCMDS+=		rsh
@@ -36,7 +43,14 @@ RCMDSDIR=	${FILESDIR}
 RCMDSMODE=	${FILESMODE}
 .endif
 
+.if ${MK_TELNET} != "no"
+FILESGROUPS+=	TELNET
+TELNET+=	telnetd
+TELNETPACKAGE+=	telnet
+TELNETDIR=	${FILESDIR}
+TELNETMODE=	${FILESMODE}
+.endif
+
 FILESMODE_README=	444
-LINKS=	${FILESDIR}/ftpd ${FILESDIR}/ftp
 
 .include <bsd.prog.mk>
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 7a9ec7d2538..f167020d660 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1613,6 +1613,8 @@ OLD_FILES+=usr/share/man/man8/fmtree.8.gz
 
 .if ${MK_FTP} == no
 OLD_FILES+=etc/ftpusers
+OLD_FILES+=etc/pam.d/ftp
+OLD_FILES+=etc/pam.d/ftpd
 OLD_FILES+=etc/rc.d/ftpd
 OLD_FILES+=usr/bin/ftp
 OLD_FILES+=usr/bin/gate-ftp
@@ -8037,6 +8039,7 @@ OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
 .endif
 
 .if ${MK_TELNET} == no
+OLD_FILES+=etc/pam.d/telnetd
 OLD_FILES+=usr/bin/telnet
 OLD_FILES+=usr/libexec/telnetd
 OLD_FILES+=usr/share/man/man1/telnet.1.gz