diff --git a/libexec/makewhatis.local/Makefile b/libexec/makewhatis.local/Makefile
--- a/libexec/makewhatis.local/Makefile
+++ b/libexec/makewhatis.local/Makefile
@@ -1,3 +1,4 @@
+PACKAGE=	mandoc
 SCRIPTS=	makewhatis.local.sh
 MAN=		makewhatis.local.8
 SCRIPTSDIR=	${LIBEXECDIR}
diff --git a/usr.sbin/periodic/etc/weekly/Makefile b/usr.sbin/periodic/etc/weekly/Makefile
--- a/usr.sbin/periodic/etc/weekly/Makefile
+++ b/usr.sbin/periodic/etc/weekly/Makefile
@@ -8,12 +8,11 @@
 
 # NB: keep these sorted by MK_* knobs
 
-.if ${MK_LOCATE} != "no"
-CONFS+=	310.locate
-.endif
+CONFGROUPS.${MK_LOCATE}+=	LOCATE
+LOCATE=	310.locate
 
-.if ${MK_MAN_UTILS} != "no"
-CONFS+=	320.whatis
-.endif
+CONFGROUPS.${MK_MAN_UTILS}+=	WHATIS
+WHATISPACKAGE=			mandoc
+WHATIS=	320.whatis
 
 .include <bsd.prog.mk>