diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -39,14 +39,14 @@
 
 .if ${group} == "FILES"
 FILESPACKAGE?=	${PACKAGE:Uutilities}
-FILESTAGS+=	${TAGS}
+FILESTAGS+=	${TAGS:Npackage=*}
 .endif
 
 .if defined(NO_ROOT)
 .if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
-${group}TAGS+=		package=${${group}PACKAGE:Uutilities}
+${group}TAGS+=		package=${${group}PACKAGE:U${PACKAGE:Uutilities}}
 .endif
-${group}TAG_ARGS=	-T ${${group}TAGS:[*]:S/ /,/g}
+${group}TAG_ARGS=	-T ${${group}TAGS:ts,:[*]}
 .endif
 
 
diff --git a/share/syscons/Makefile.inc b/share/syscons/Makefile.inc
--- a/share/syscons/Makefile.inc
+++ b/share/syscons/Makefile.inc
@@ -1 +1 @@
-FILESPACKAGE=	syscons
+FILESPACKAGE=	syscons-data
diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
--- a/share/syscons/fonts/Makefile
+++ b/share/syscons/fonts/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	syscons-data
-
 FILES=	armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \
 	cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \
 	cp437-thin-8x8.fnt cp437-thin-8x16.fnt \
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	syscons-data
-
 FILES=	INDEX.keymaps \
 	be.iso.kbd be.iso.acc.kbd \
 	bg.bds.ctrlcaps.kbd bg.phonetic.ctrlcaps.kbd \
diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile
--- a/share/syscons/scrnmaps/Makefile
+++ b/share/syscons/scrnmaps/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	syscons-data
-
 SCRMAPS = armscii8-2haik8.scm \
 	  iso-8859-1_to_cp437.scm iso-8859-4_for_vga9.scm \
 	  iso-8859-7_to_cp437.scm \