diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
index c7c6a1b36dc7..b60631e3805b 100644
--- a/share/syscons/fonts/Makefile
+++ b/share/syscons/fonts/Makefile
@@ -1,35 +1,37 @@
 # $FreeBSD$
 
+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 \
 	cp850-8x8.fnt cp850-8x14.fnt cp850-8x16.fnt \
 	cp850-thin-8x8.fnt cp850-thin-8x16.fnt \
 	cp865-8x8.fnt cp865-8x14.fnt cp865-8x16.fnt \
 	cp865-thin-8x8.fnt cp865-thin-8x16.fnt \
 	cp866-8x8.fnt cp866-8x14.fnt cp866-8x16.fnt \
 	cp866b-8x16.fnt cp866c-8x16.fnt \
 	cp866u-8x16.fnt cp866u-8x14.fnt cp866u-8x8.fnt \
 	cp1251-8x8.fnt cp1251-8x14.fnt cp1251-8x16.fnt \
 	haik8-8x8.fnt haik8-8x14.fnt haik8-8x16.fnt \
 	iso-8x8.fnt iso-8x14.fnt iso-8x16.fnt \
 	iso02-8x8.fnt iso02-8x14.fnt iso02-8x16.fnt \
 	iso04-8x8.fnt iso04-8x14.fnt iso04-8x16.fnt iso04-wide-8x16.fnt \
 	iso04-vga9-8x8.fnt iso04-vga9-8x14.fnt iso04-vga9-8x16.fnt \
 	iso04-vga9-wide-8x16.fnt \
 	iso05-8x8.fnt iso05-8x14.fnt iso05-8x16.fnt \
 	iso07-8x8.fnt iso07-8x14.fnt iso07-8x16.fnt \
 	iso08-8x8.fnt iso08-8x14.fnt iso08-8x16.fnt \
 	iso09-8x16.fnt \
 	iso15-8x8.fnt iso15-8x14.fnt iso15-8x16.fnt \
 	iso-thin-8x16.fnt iso15-thin-8x16.fnt \
 	koi8-r-8x8.fnt koi8-r-8x14.fnt koi8-r-8x16.fnt \
 	koi8-rb-8x16.fnt koi8-rc-8x16.fnt \
 	koi8-u-8x8.fnt koi8-u-8x14.fnt koi8-u-8x16.fnt \
 	swiss-8x16.fnt swiss-8x14.fnt swiss-8x8.fnt \
 	swiss-1251-8x16.fnt swiss-1131-8x16.fnt \
 	INDEX.fonts
 
 FILESDIR= ${SHAREDIR}/syscons/fonts
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
index f04b4fa75d35..079ffa91f7bc 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -1,57 +1,59 @@
 # $FreeBSD$
 
+PACKAGE=	syscons-data
+
 FILES=	INDEX.keymaps \
 	be.iso.kbd be.iso.acc.kbd \
 	bg.bds.ctrlcaps.kbd bg.phonetic.ctrlcaps.kbd \
 	br275.iso.kbd br275.iso.acc.kbd br275.cp850.kbd \
 	by.cp1131.kbd by.cp1251.kbd by.iso5.kbd \
 	ce.iso2.kbd \
 	colemak-dh.iso15.acc.kbd \
 	colemak.iso15.acc.kbd \
 	cs.latin2.qwertz.kbd \
 	cz.iso2.kbd \
 	danish.iso.kbd danish.iso.acc.kbd danish.cp865.kbd \
 	danish.iso.macbook.kbd \
 	dutch.iso.acc.kbd \
 	eee_nordic.kbd el.iso07.kbd \
 	estonian.iso.kbd estonian.iso15.kbd estonian.cp850.kbd \
 	finnish.iso.kbd finnish.cp850.kbd \
 	fr.iso.kbd fr.iso.acc.kbd fr.dvorak.kbd fr.dvorak.acc.kbd \
 	fr.macbook.acc.kbd \
 	fr_CA.iso.acc.kbd \
 	german.iso.kbd german.iso.acc.kbd german.cp850.kbd \
 	gr.elot.acc.kbd gr.us101.acc.kbd \
 	hr.iso.kbd \
 	hu.iso2.101keys.kbd hu.iso2.102keys.kbd \
 	hy.armscii-8.kbd \
 	icelandic.iso.kbd icelandic.iso.acc.kbd \
 	it.iso.kbd \
 	iw.iso8.kbd \
 	jp.106.kbd jp.106x.kbd \
 	kk.pt154.kst.kbd kk.pt154.io.kbd \
 	latinamerican.kbd latinamerican.iso.acc.kbd \
 	lt.iso4.kbd \
 	norwegian.iso.kbd norwegian.dvorak.kbd \
 	pl_PL.ISO8859-2.kbd pl_PL.dvorak.kbd \
 	pt.iso.kbd pt.iso.acc.kbd \
 	ru.koi8-r.kbd ru.koi8-r.shift.kbd ru.koi8-r.win.kbd \
 	ru.cp866.kbd ru.iso5.kbd \
 	si.iso.kbd \
 	sk.iso2.kbd \
 	spanish.dvorak.kbd \
 	spanish.iso.kbd spanish.iso.acc.kbd spanish.iso15.acc.kbd \
 	swedish.iso.kbd swedish.cp850.kbd \
 	swissfrench.iso.kbd swissfrench.iso.acc.kbd swissfrench.cp850.kbd \
 	swissgerman.iso.kbd swissgerman.iso.acc.kbd swissgerman.cp850.kbd \
 	swissgerman.macbook.acc.kbd \
 	tr.iso9.q.kbd \
 	ua.koi8-u.kbd ua.koi8-u.shift.alt.kbd ua.iso5.kbd \
 	uk.iso.kbd uk.iso-ctrl.kbd uk.cp850.kbd uk.cp850-ctrl.kbd \
 	uk.dvorak.kbd \
 	us.iso.kbd us.dvorak.kbd us.dvorakl.kbd us.dvorakr.kbd us.dvorakp.kbd \
 	us.dvorakx.kbd us.emacs.kbd us.pc-ctrl.kbd us.unix.kbd us.iso.acc.kbd \
 	us.iso.macbook.kbd
 
 FILESDIR= ${SHAREDIR}/syscons/keymaps
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile
index 0f11c777fa02..fb6bf59131b9 100644
--- a/share/syscons/scrnmaps/Makefile
+++ b/share/syscons/scrnmaps/Makefile
@@ -1,27 +1,29 @@
 # $FreeBSD$
 
+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 \
 	  koi8-r2cp866.scm koi8-u2cp866u.scm \
 	  us-ascii_to_cp437.scm
 
 SCRMAPS_MK = ${SCRMAPS:R:S/$/.mk/g}
 CLEANFILES+= ${SCRMAPS_MK} ${SCRMAPS}
 
 FILES=	${SCRMAPS}
 FILESDIR= ${SHAREDIR}/syscons/scrnmaps
 
 DEPENDOBJS+= ${SCRMAPS_MK}
 build-tools: ${SCRMAPS_MK}
 
 ${SCRMAPS}: ${.TARGET:R}.mk
 	${BTOOLSPATH:U.}/${.TARGET:R}.mk ${.TARGET:R}.tmp
 	uuencode ${.TARGET:R}.tmp ${.TARGET:R} > ${.TARGET}
 	rm -f ${.TARGET:R}.tmp
 
 ${SCRMAPS_MK}: ${.TARGET:R} mkscrfil.c ${BUILD_TOOLS_META}
 	${CC:N${CCACHE_BIN}} ${CFLAGS} -I${.CURDIR} -DFIL=\"${.TARGET:R}\" \
 	    ${LDFLAGS} -o ${.TARGET} ${.CURDIR}/mkscrfil.c
 
 .include <bsd.prog.mk>