Index: projects/release-pkg/bin/rcp/Makefile
===================================================================
--- projects/release-pkg/bin/rcp/Makefile	(revision 294516)
+++ projects/release-pkg/bin/rcp/Makefile	(revision 294517)
@@ -1,11 +1,13 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 # $FreeBSD$
 
 PROG=	rcp
 SRCS=	rcp.c util.c
 CFLAGS+=-DBINDIR=${BINDIR}
 
+PACKAGE=rcmds
+
 BINOWN=	root
 BINMODE=4555
 
 .include <bsd.prog.mk>
Index: projects/release-pkg/etc/pam.d/Makefile
===================================================================
--- projects/release-pkg/etc/pam.d/Makefile	(revision 294516)
+++ projects/release-pkg/etc/pam.d/Makefile	(revision 294517)
@@ -1,34 +1,41 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 NO_OBJ=
 
 FILESGROUPS=	FILES
 
 FILES=	README \
 	cron \
 	ftpd \
 	imap \
 	login \
 	other \
 	passwd pop3 \
-	rsh \
 	sshd su system \
 	telnetd \
 	xdm
 
 .if ${MK_AT} != "no"
 FILESGROUPS+=	AT
 AT+=	atrun
 ATPACKAGE+=	at
 ATDIR=	/etc/pam.d
 ATMODE=	644
+.endif
+
+.if ${MK_RCMDS} != "no"
+FILESGROUPS+=	RCMDS
+RCMDS+=		rsh
+RCMDSPACKAGE+=	rcmds
+RCMDSDIR=	/etc/pam.d
+RCMDSMODE=	644
 .endif
 
 FILESDIR=	/etc/pam.d
 FILESMODE=	644
 FILESMODE_README=	444
 LINKS=	${FILESDIR}/ftpd ${FILESDIR}/ftp
 
 .include <bsd.prog.mk>
Index: projects/release-pkg/libexec/rlogind/Makefile
===================================================================
--- projects/release-pkg/libexec/rlogind/Makefile	(revision 294516)
+++ projects/release-pkg/libexec/rlogind/Makefile	(revision 294517)
@@ -1,15 +1,16 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG=	rlogind
 MAN=	rlogind.8
+PACKAGE=rcmds
 LIBADD=	util
 WARNS?=	2
 
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6
 .endif
 
 .include <bsd.prog.mk>
Index: projects/release-pkg/libexec/rshd/Makefile
===================================================================
--- projects/release-pkg/libexec/rshd/Makefile	(revision 294516)
+++ projects/release-pkg/libexec/rshd/Makefile	(revision 294517)
@@ -1,12 +1,14 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
 PROG=	rshd
 MAN=	rshd.8
 
+PACKAGE=rcmds
+
 WARNS?=	3
 WFORMAT=0
 
 LIBADD=	util pam
 
 .include <bsd.prog.mk>
Index: projects/release-pkg/release/packages/rcmds-debug.ucl
===================================================================
--- projects/release-pkg/release/packages/rcmds-debug.ucl	(nonexistent)
+++ projects/release-pkg/release/packages/rcmds-debug.ucl	(revision 294517)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Remote Command Tools (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
Index: projects/release-pkg/release/packages/rcmds.ucl
===================================================================
--- projects/release-pkg/release/packages/rcmds.ucl	(nonexistent)
+++ projects/release-pkg/release/packages/rcmds.ucl	(revision 294517)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Remote Command Tools"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
Index: projects/release-pkg/usr.bin/rlogin/Makefile
===================================================================
--- projects/release-pkg/usr.bin/rlogin/Makefile	(revision 294516)
+++ projects/release-pkg/usr.bin/rlogin/Makefile	(revision 294517)
@@ -1,9 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 # $FreeBSD$
 
 PROG=	rlogin
 
+PACKAGE=rcmds
+
 BINOWN=	root
 BINMODE=4555
 
 .include <bsd.prog.mk>
Index: projects/release-pkg/usr.bin/rsh/Makefile
===================================================================
--- projects/release-pkg/usr.bin/rsh/Makefile	(revision 294516)
+++ projects/release-pkg/usr.bin/rsh/Makefile	(revision 294517)
@@ -1,10 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 # $FreeBSD$
 
 PROG=	rsh
 CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
 
+PACKAGE=rcmds
+
 BINOWN=	root
 BINMODE=4555
 
 .include <bsd.prog.mk>
Index: projects/release-pkg/usr.bin/ruptime/Makefile
===================================================================
--- projects/release-pkg/usr.bin/ruptime/Makefile	(revision 294516)
+++ projects/release-pkg/usr.bin/ruptime/Makefile	(revision 294517)
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
 PROG=	ruptime
 
+PACKAGE=rcmds
+
 .include <bsd.prog.mk>
Index: projects/release-pkg/usr.bin/rwho/Makefile
===================================================================
--- projects/release-pkg/usr.bin/rwho/Makefile	(revision 294516)
+++ projects/release-pkg/usr.bin/rwho/Makefile	(revision 294517)
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
 PROG=	rwho
 
+PACKAGE=rcmds
+
 .include <bsd.prog.mk>
Index: projects/release-pkg/usr.sbin/rwhod/Makefile
===================================================================
--- projects/release-pkg/usr.sbin/rwhod/Makefile	(revision 294516)
+++ projects/release-pkg/usr.sbin/rwhod/Makefile	(revision 294517)
@@ -1,9 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
 PROG=	rwhod
 MAN=	rwhod.8
 
+PACKAGE=rcmds
+
 WARNS?=	3
 
 .include <bsd.prog.mk>