diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -857,7 +857,7 @@
             scrnmaps
             ..
         ..
-        tabset
+        tabset                tags=package=ncurses-lib
         ..
         vi
             catalog
diff --git a/etc/termcap/Makefile b/etc/termcap/Makefile
--- a/etc/termcap/Makefile
+++ b/etc/termcap/Makefile
@@ -1,6 +1,8 @@
 .PATH: ${SRCTOP}/share/termcap
 
-PACKAGE=	runtime
+# Note: This is in ncurses-lib rather than ncurses because without it, ncurses
+# doesn't work, and the base ncurses package is optional.
+PACKAGE=	ncurses-lib
 CLEANFILES+=	termcap.small
 CONFS=		termcap.small
 
diff --git a/share/tabset/Makefile b/share/tabset/Makefile
--- a/share/tabset/Makefile
+++ b/share/tabset/Makefile
@@ -1,3 +1,5 @@
+PACKAGE=	ncurses-lib
+
 FILES=	3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \
 	stdcrt tandem653 teleray vt100 vt100-w wyse-adds xerox1720 xerox1730 \
 	xerox1730-lm zenith29
diff --git a/share/termcap/Makefile b/share/termcap/Makefile
--- a/share/termcap/Makefile
+++ b/share/termcap/Makefile
@@ -1,10 +1,13 @@
 # reorder gives an editor command for most common terminals
 # (in reverse order from n'th to 1'st most commonly used)
 # to move them to the front of termcap
-#
-MAN=	termcap.5
 
-PACKAGE=	runtime
+MAN=		termcap.5
+MANPACKAGE=	ncurses
+
+# Note: This is in ncurses-lib rather than ncurses because without it, ncurses
+# doesn't work, and the base ncurses package is optional.
+PACKAGE=	ncurses-lib
 FILES=		termcap termcap.db
 FILESDIR=	${BINDIR}/misc
 CLEANFILES+=	termcap.db
@@ -16,7 +19,7 @@
 	${CAP_MKDB_CMD} ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC}
 
 etc-termcap:
-	${INSTALL_SYMLINK} -T "package=runtime" \
+	${INSTALL_SYMLINK} -T "package=ncurses-lib" \
 	    ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
 
 .include <bsd.prog.mk>