diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,7 +1,7 @@
 .include <src.opts.mk>
 
 MANGROUPS=	MAN
-MANPACKAGE=	kernel
+MANPACKAGE=	kernel-man
 
 # If you add a new file here, please consider adding an entry to the
 # hardware notes template (website/archetypes/release/hardware.adoc in
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,6 +1,6 @@
 .include <src.opts.mk>
 
-PACKAGE=	kernel
+PACKAGE=	kernel-man
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -105,15 +105,16 @@
 ${__group}OWN?=		${MANOWN}
 ${__group}GRP?=		${MANGRP}
 ${__group}MODE?=	${MANMODE}
+${__group}PACKAGE?=	${PACKAGE:Uutilities}
 
 # Tag processing is only done for NO_ROOT installs.
 .if defined(NO_ROOT)
 
 .if !defined(${__group}TAGS) || ! ${${__group}TAGS:Mpackage=*}
-.if ${MK_MANSPLITPKG} == "no"
-${__group}TAGS+=	package=${${__group}PACKAGE:U${PACKAGE:Uutilities}}
+.if ${MK_MANSPLITPKG} == "no" || ${${__group}PACKAGE:M*-man}
+${__group}TAGS+=	package=${${__group}PACKAGE}
 .else
-${__group}TAGS+=	package=${${__group}PACKAGE:U${PACKAGE:Uutilities}}-man
+${__group}TAGS+=	package=${${__group}PACKAGE}-man
 .endif
 .endif