3 files changed, 2 insertions, 13 deletions

diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 2e60cb9c4cbf..a5139249e03f 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -116,7 +116,6 @@
 #NOSECURE=	true	# do not build crypto code in secure/ subdir
 #NOSHARE=	true	# do not go into the share subdir
 #NOUUCP=	true	# do not build uucp related programs
-#NO_RCMNDS=	true	# do not build rlogin, rsh & rcp
 #
 # To build the OpenSSL manpages, uncomment the following.  These are not
 # built by default because they clobber a number of system manpages with
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index e183550082a4..21793f20410a 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -414,13 +414,6 @@ Set to not build OpenSSL (implies
 Set to avoid building
 .Xr perl 1 .
 (Also disables OpenSSL optimizations.)
-.It Va NO_RCMNDS
-.Pq Vt bool
-Set to not build
-.Xr rcp 1 ,
-.Xr rlogin 1
-and
-.Xr rsh 1 .
 .It Va NO_SENDMAIL
 .Pq Vt bool
 Set to not build
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 18b7dc56e12f..935fd9864fa7 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -121,9 +121,11 @@ SUBDIR=	apply \
 	quota \
 	renice \
 	rev \
+	rlogin \
 	rpcgen \
 	rpcinfo \
 	rs \
+	rsh \
 	rup \
 	ruptime \
 	rusers \
@@ -228,11 +230,6 @@ SUBDIR+=ar \
 SUBDIR+=uac
 .endif
 
-.if !defined(NO_RCMNDS)
-SUBDIR+=rlogin \
-	rsh
-.endif
-
 # Things which don't compile on new platforms yet:
 .if ${MACHINE_ARCH} != "sparc64" && ${MACHINE_ARCH} != "ia64"
 SUBDIR+=xlint