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
@@ -11,21 +11,16 @@
 	SERVERS \
 	adjkerntz \
 	bgfsck \
-	${_blacklistd} \
 	bridge \
 	cfumass \
 	cleanvar \
 	cleartmp \
-	ctld \
 	ddb \
 	defaultroute \
 	devfs \
 	dmesg \
 	dumpon \
 	fsck \
-	geli \
-	geli2 \
-	gptboot \
 	growfs \
 	growfs_fstab \
 	hostid \
@@ -44,7 +39,6 @@
 	linux \
 	local \
 	localpkg \
-	lockd \
 	mixer \
 	motd \
 	mountcritlocal \
@@ -54,24 +48,13 @@
 	mdconfig2 \
 	mountd \
 	msgs \
-	natd \
 	netif \
 	netoptions \
 	netwait \
-	newsyslog \
-	nfsclient \
-	nfscbd \
-	nfsd \
-	nfsuserd \
-	nisdomain \
 	${_nscd} \
 	${_opensm} \
 	os-release \
-	pf \
-	pflog \
-	pfsync \
 	powerd \
-	ppp \
 	pppoed \
 	pwcheck \
 	quota \
@@ -84,7 +67,6 @@
 	rpcbind \
 	rtadvd \
 	rtsold \
-	rwho \
 	savecore \
 	securelevel \
 	serial \
@@ -96,11 +78,9 @@
 	swaplate \
 	sysctl \
 	sysctl_lastload \
-	syslogd \
 	sysvipc \
 	tmp \
 	ugidfw \
-	${_utx} \
 	var \
 	var_run \
 	watchdogd
@@ -117,6 +97,12 @@
 DHCLIENT=		dhclient
 DHCLIENTPACKAGE=	dhclient
 
+CONFGROUPS+=		GEOM
+GEOM=			geli \
+			geli2 \
+			gptboot
+GEOMPACKAGE=		geom
+
 CONFGROUPS+=		GGATED
 GGATED=			ggated
 GGATEDPACKAGE=		ggate
@@ -129,20 +115,35 @@
 CRON+=			cron
 CRONPACKAGE=		cron
 
-.if ${MK_NIS} != "no"
-CONFS+=	ypbind \
-	ypldap \
-	yppasswdd \
-	ypserv \
-	ypset \
-	ypupdated \
-	ypxfrd
-.endif
+CONFGROUPS+=		NFS
+NFS=			nfsclient \
+			nfsd \
+			nfsuserd \
+			nfscbd \
+			lockd
+NFSPACKAGE=		nfs
 
-.if ${MK_ACCT} != "no"
+CONFGROUPS+=		NEWSYSLOG
+NEWSYSLOG=		newsyslog
+NEWSYSLOGPACKAGE=	newsyslog
+
+CONFGROUPS+=		SYSLOGD
+SYSLOGD=		syslogd
+SYSLOGDPACKAGE=		syslogd
+
+CONFGROUPS+=		RCMDS
+RCMDS=			rwho
+RCMDSPACKAGE=		rcmds
+
+.if ${MK_ACCT} != "no" || ${MK_UTMPX} != "no"
 CONFGROUPS+=	ACCT
-ACCT+=		accounting
 ACCTPACKAGE=	acct
+.if ${MK_ACCT} != "no"
+ACCT+=		accounting
+.endif
+.if ${MK_UTMPX} != "no"
+ACCT+=		utx
+.endif
 .endif
 
 .if ${MK_ACPI} != "no"
@@ -168,13 +169,17 @@
 .endif
 
 .if ${MK_AUTOFS} != "no"
-CONFS+=		automount
-CONFS+=		automountd
-CONFS+=		autounmountd
+CONFGROUPS+=	AUTOFS
+AUTOFS=		automount \
+		automountd \
+		autounmountd
+AUTOFSPACKAGE=	autofs
 .endif
 
 .if ${MK_BLACKLIST} != "no"
-_blacklistd+=	blacklistd
+CONFGROUPS+=	BLOCKLIST
+BLOCKLIST=	blacklistd
+BLOCKLISTPACKAGE=blocklist
 .endif
 
 .if ${MK_BLUETOOTH} != "no"
@@ -199,11 +204,15 @@
 .endif
 
 .if ${MK_CCD} != "no"
-CONFS+=		ccd
+CONFGROUPS+=	CCD
+CCD=		ccd
+CCDPACKAGE=	ccdconfig
 .endif
 
 .if ${MK_FTP} != "no"
-CONFS+=		ftpd
+CONFGROUPS+=	FTPD
+FTPD=		ftpd
+FTPDPACKAGE=	ftpd
 .endif
 
 .if ${MK_GSSAPI} != "no"
@@ -219,28 +228,41 @@
 .endif
 
 .if ${MK_INETD} != "no"
-CONFS+=		inetd
+CONFGROUPS+=	INETD
+INETD=		inetd
+INETDPACKAGE=	inetd
 .endif
 
 .if ${MK_IPFILTER} != "no"
-CONFS+=	ipfilter \
-	ipfs \
-	ipmon \
-	ipnat \
-	ippool
+CONFGROUPS+=	IPF
+IPF=		ipfilter \
+		ipfs \
+		ipmon \
+		ipnat \
+		ippool
+IPFPACKAGE=	ipf
 .endif
 
 .if ${MK_IPFW} != "no"
-CONFS+=		ipfw \
-		dnctl
+CONFGROUPS+=	IPFW
+IPFW=		ipfw dnctl
 .if ${MK_NETGRAPH} != "no"
-CONFS+=		ipfw_netflow
+IPFW+=		ipfw_netflow
 .endif
+IPFWPACKAGE=	ipfw
+
+# natd is only built when ipfw is built
+CONFGROUPS+=	NATD
+NATD+=		natd
+NATDPACKAGE=	natd
 .endif
 
 .if ${MK_ISCSI} != "no"
-CONFS+=		iscsictl
-CONFS+=		iscsid
+CONFGROUPS+=	ISCSI
+ISCSI=		iscsictl	\
+		iscsid		\
+		ctld
+ISCSIPACKAGE=	iscsi
 .endif
 
 .if ${MK_JAIL} != "no"
@@ -275,6 +297,19 @@
 VAR_HEMIDAL_MODE=	700
 .endif
 
+.if ${MK_NIS} != "no"
+CONFGROUPS+=	YP
+YP=		ypbind \
+		ypldap \
+		yppasswdd \
+		ypserv \
+		ypset \
+		ypupdated \
+		ypxfrd \
+		nisdomain
+YPPACKAGE=	yp
+.endif
+
 .if ${MK_NS_CACHING} != "no"
 _nscd=		nscd
 .endif
@@ -302,7 +337,18 @@
 .endif
 
 .if ${MK_PF} != "no"
-CONFS+=		ftp-proxy
+CONFGROUPS+=	PF
+PF=		pf \
+		pflog \
+		pfsync \
+		ftp-proxy
+PFPACKAGE=	pf
+.endif
+
+.if ${MK_PPP} != "no"
+CONFGROUPS+=	PPP
+PPP=		ppp
+PPPPACKAGE=	ppp
 .endif
 
 .if ${MK_ROUTED} != "no"
@@ -327,10 +373,6 @@
 UNBOUNDPACKAGE=	unbound
 .endif
 
-.if ${MK_UTMPX} != "no"
-_utx=		utx
-.endif
-
 .if ${MK_VI} != "no"
 CONFGROUPS+=	VI
 VI+=		virecover
@@ -338,8 +380,13 @@
 .endif
 
 .if ${MK_WIRELESS} != "no"
-CONFS+=		hostapd
-CONFS+=		wpa_supplicant
+CONFGROUPS+=	HOSTAPD
+HOSTAPD=	hostapd
+HOSTAPDPACKAGE=	hostapd
+
+CONFGROUPS+=	WPA
+WPA=		wpa_supplicant
+WPAPACKAGE=	wpa
 .endif
 
 .if ${MK_ZFS} != "no"
@@ -352,7 +399,7 @@
 ZFS+=		zpoolreguid
 ZFS+=		zpoolupgrade
 ZFS+=		zvol
-ZFSPACKAGE=	rc
+ZFSPACKAGE=	zfs
 .endif
 
 .for fg in ${CONFGROUPS}