diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index de0f8f2a907..41e05eecab9 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+FILESGROUPS=FILES
+
 FILES=	100.clean-disks \
 	110.clean-tmps \
 	120.clean-preserve \
@@ -23,8 +25,12 @@ FILES=	100.clean-disks \
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_ACCT} != "no"
-FILES+=	310.accounting
+FILESGROUPS+=	ACCT
+ACCT+=		310.accounting
 .endif
+ACCTDIR=	/etc/periodic/daily
+ACCTMODE=	${BINMODE}
+ACCTPACKAGE=	acct
 
 .if ${MK_CALENDAR} != "no"
 FILES+=	300.calendar
diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile
index ea2bd9f0b05..64642193c57 100644
--- a/etc/periodic/monthly/Makefile
+++ b/etc/periodic/monthly/Makefile
@@ -2,13 +2,19 @@
 
 .include <src.opts.mk>
 
+FILESGROUPS=FILES
+
 FILES=	450.status-security \
 	999.local
 
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_UTMPX} != "no"
-FILES+=	200.accounting
+FILESGROUPS+=	ACCT
+ACCT+=		200.accounting
 .endif
+ACCTDIR=	/etc/periodic/monthly
+ACCTMODE=	${BINMODE}
+ACCTPACKAGE=	acct
 
 .include <bsd.prog.mk>
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 192971822ce..0a577594f0b 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -10,7 +10,6 @@ FILES=	DAEMON \
 	NETWORKING \
 	SERVERS \
 	abi \
-	accounting \
 	addswap \
 	adjkerntz \
 	archdep \