diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile
index 7369022cc8b6..2d3356a8fca9 100644
--- a/etc/pam.d/Makefile
+++ b/etc/pam.d/Makefile
@@ -2,6 +2,8 @@
 
 NO_OBJ=
 
+.include <src.opts.mk>
+
 FILES=	README \
 	atrun \
 	cron \
@@ -10,11 +12,17 @@ FILES=	README \
 	login \
 	other \
 	passwd pop3 \
-	rsh \
 	sshd su system \
-	telnetd \
 	xdm
 
+.if ${MK_RCMDS} != "no"
+FILES+=	rsh
+.endif
+
+.if ${MK_TELNET} != "no"
+FILES+=	telnetd
+.endif
+
 FILESDIR=	/etc/pam.d
 FILESMODE=	644
 FILESMODE_README=	444
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index d302898b9f78..ea74c320323a 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -3913,6 +3913,7 @@ OLD_FILES+=usr/lib/private/libssh_p.a
 
 .if ${MK_RCMDS} == no
 OLD_FILES+=bin/rcp
+OLD_FILES+=etc/pam.d/rsh
 OLD_FILES+=etc/rc.d/rwho
 OLD_FILES+=etc/periodic/daily/140.clean-rwho 
 OLD_FILES+=etc/periodic/daily/430.status-rwho
@@ -4279,6 +4280,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