diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -62,7 +62,6 @@
 	rarpd \
 	rctl \
 	root \
-	route6d \
 	routing \
 	rpcbind \
 	rtadvd \
@@ -355,8 +354,16 @@
 PPPPACKAGE=	ppp
 .endif
 
+.if ${MK_INET6} != "no" || ${MK_ROUTED} != "no"
+CONFGROUPS+=	RIP
+RIPPACKAGE=	rip
+
+.if ${MK_INET6} != "no"
+RIP+=		route6d
+.endif
 .if ${MK_ROUTED} != "no"
-CONFS+=		routed
+RIP+=		routed
+.endif
 .endif
 
 .if ${MK_SENDMAIL} != "no"
diff --git a/release/packages/ucl/rip-all.ucl b/release/packages/ucl/rip-all.ucl
new file mode 100644
--- /dev/null
+++ b/release/packages/ucl/rip-all.ucl
@@ -0,0 +1,8 @@
+comment = "RIP routing protocol"
+desc = <<EOD
+routed(8) and route6d(8) allow the host to participate in a RIP (IPv4) or
+RIPng (IPv6) routing domain, exchanging routing information with other RIP
+routers.
+
+RIP support is deprecated and will be removed in FreeBSD 16.0.
+EOD
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -1,6 +1,6 @@
 # Make `routed` for FreeBSD
 
-PACKAGE=runtime
+PACKAGE=rip
 PROG=	routed
 MAN=	routed.8
 SRCS=	if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
diff --git a/sbin/routed/Makefile.inc b/sbin/routed/Makefile.inc
--- a/sbin/routed/Makefile.inc
+++ b/sbin/routed/Makefile.inc
@@ -1 +1,3 @@
+PACKAGE=	rip
+
 .include "../Makefile.inc"
diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile
--- a/usr.sbin/rip6query/Makefile
+++ b/usr.sbin/rip6query/Makefile
@@ -1,3 +1,4 @@
+PACKAGE=rip
 PROG=	rip6query
 MAN=	rip6query.8
 
diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile
--- a/usr.sbin/route6d/Makefile
+++ b/usr.sbin/route6d/Makefile
@@ -1,3 +1,4 @@
+PACKAGE=rip
 PROG=	route6d
 MAN=	route6d.8