diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index e25144992931..c32ff16b5b02 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -133,10 +133,8 @@ SUBDIR=	alias \
 	rpcinfo \
 	rs \
 	rup \
-	ruptime \
 	rusers \
 	rwall \
-	rwho \
 	script \
 	sdiff \
 	sed \
@@ -253,6 +251,8 @@ SUBDIR.${MK_OPENSSL}+=	newkey
 SUBDIR.${MK_QUOTAS}+=	quota
 SUBDIR.${MK_RCMDS}+=	rlogin
 SUBDIR.${MK_RCMDS}+=	rsh
+SUBDIR.${MK_RCMDS}+=	ruptime
+SUBDIR.${MK_RCMDS}+=	rwho
 SUBDIR.${MK_SENDMAIL}+=	vacation
 SUBDIR.${MK_TALK}+=	talk
 SUBDIR.${MK_TELNET}+=	telnet
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 8053974babf9..63426eaefca3 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -38,6 +38,15 @@
 .Nm
 .Op Fl alrtu
 .Op Ar host ...
+.Sh DEPRECATION NOTICE
+.Nm
+is deprecated and will be removed from future versions of the
+.Fx
+base system.
+If
+.Nm
+is still required, it can be installed from ports or packages
+(net/bsdrcmds).
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/rwho/rwho.1 b/usr.bin/rwho/rwho.1
index 20420769bc0b..6a0845c27dad 100644
--- a/usr.bin/rwho/rwho.1
+++ b/usr.bin/rwho/rwho.1
@@ -37,6 +37,15 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl a
+.Sh DEPRECATION NOTICE
+.Nm
+is deprecated and will be removed from future versions of the
+.Fx
+base system.
+If
+.Nm
+is still required, it can be installed from ports or packages
+(net/bsdrcmds).
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index cb7aabc5be37..b1b5c5026678 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -74,7 +74,6 @@ SUBDIR=	adduser \
 	rpc.statd \
 	rpc.umntall \
 	rtprio \
-	rwhod \
 	service \
 	services_mkdb \
 	sesutil \
@@ -192,6 +191,7 @@ SUBDIR.${MK_PPP}+=	ppp
 SUBDIR.${MK_QUOTAS}+=	edquota
 SUBDIR.${MK_QUOTAS}+=	quotaon
 SUBDIR.${MK_QUOTAS}+=	repquota
+SUBDIR.${MK_RCMDS}+=	rwhod
 SUBDIR.${MK_SENDMAIL}+=	editmap
 SUBDIR.${MK_SENDMAIL}+=	mailstats
 SUBDIR.${MK_SENDMAIL}+=	makemap
diff --git a/usr.sbin/rwhod/rwhod.8 b/usr.sbin/rwhod/rwhod.8
index 3124d8781c86..2d181815c737 100644
--- a/usr.sbin/rwhod/rwhod.8
+++ b/usr.sbin/rwhod/rwhod.8
@@ -40,6 +40,15 @@
 .Op Fl p
 .Op Fl l
 .Op Fl m Op Ar ttl
+.Sh DEPRECATION NOTICE
+.Nm
+is deprecated and will be removed from future versions of the
+.Fx
+base system.
+If
+.Nm
+is still required, it can be installed from ports or packages
+(net/bsdrcmds).
 .Sh DESCRIPTION
 The
 .Nm