diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	runtime
+PACKAGE=	ufs
 LIB=	ufs
 SHLIBDIR?= /lib
 SHLIB_MAJOR=	7
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -136,6 +136,8 @@
 telnet_DESC=		Telnet client
 tests_COMMENT= 		Test Suite
 tests_DESC= 		Test Suite
+ufs_COMMENT=		UFS Libraries and Utilities
+ufs_DESC=		UFS Libraries and Utilities
 unbound_COMMENT= 	Unbound DNS Resolver
 unbound_DESC= 		Unbound DNS Resolver
 utilities_COMMENT=	Non-vital programs and libraries
diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile
--- a/sbin/clri/Makefile
+++ b/sbin/clri/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=ufs
 PROG=	clri
 MAN=	clri.8
 LIBADD=	ufs
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -13,7 +13,7 @@
 #	DEBUG			use local directory to find ddate and dumpdates
 #	TDEBUG			trace out the process forking
 
-PACKAGE=runtime
+PACKAGE=ufs
 PROG=	dump
 CONFS=	/dev/null
 CONFSGRP=	operator
diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile
--- a/sbin/dumpfs/Makefile
+++ b/sbin/dumpfs/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=ufs
 PROG=	dumpfs
 WARNS?=	2
 LIBADD=	ufs
diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile
--- a/sbin/ffsinfo/Makefile
+++ b/sbin/ffsinfo/Makefile
@@ -7,7 +7,7 @@
 GROWFS= ${.CURDIR:H}/growfs
 .PATH: ${GROWFS}
 
-PACKAGE=runtime
+PACKAGE=ufs
 PROG=	ffsinfo
 SRCS=	ffsinfo.c debug.c
 MAN=	ffsinfo.8
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 #	@(#)Makefile	8.2 (Berkeley) 4/27/95
 
-PACKAGE=runtime
+PACKAGE=ufs
 PROG=	fsck_ffs
 LINKS+=	${BINDIR}/fsck_ffs ${BINDIR}/fsck_ufs
 LINKS+=	${BINDIR}/fsck_ffs ${BINDIR}/fsck_4.2bsd
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -2,7 +2,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=ufs
 PROG=	fsdb
 MAN=	fsdb.8
 SRCS=	fsdb.c fsdbutil.c \
diff --git a/sbin/fsirand/Makefile b/sbin/fsirand/Makefile
--- a/sbin/fsirand/Makefile
+++ b/sbin/fsirand/Makefile
@@ -1,7 +1,7 @@
 #	$OpenBSD: Makefile,v 1.1 1997/01/26 02:23:20 millert Exp $
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=ufs
 PROG=	fsirand
 MAN=	fsirand.8
 LIBADD=	ufs
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -8,7 +8,7 @@
 
 .PATH:	${.CURDIR:H}/mount
 
-PACKAGE=runtime
+PACKAGE=ufs
 PROG=   growfs
 SRCS=   growfs.c getmntopts.c
 MAN=	growfs.8
diff --git a/sbin/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile
--- a/sbin/mksnap_ffs/Makefile
+++ b/sbin/mksnap_ffs/Makefile
@@ -2,7 +2,7 @@
 
 .PATH:	${.CURDIR:H}/mount
 
-PACKAGE=runtime
+PACKAGE=ufs
 PROG=	mksnap_ffs
 SRCS=	mksnap_ffs.c getmntopts.c
 MAN=	mksnap_ffs.8
diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile
--- a/sbin/newfs/Makefile
+++ b/sbin/newfs/Makefile
@@ -3,6 +3,7 @@
 
 .PATH: ${SRCTOP}/sys/geom
 
+PACKAGE=	ufs
 PROG=	newfs
 LIBADD=	ufs util
 SRCS=	newfs.c mkfs.c geom_bsd_enc.c
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -3,7 +3,7 @@
 
 .PATH: ${.CURDIR:H}/dump
 
-PACKAGE=runtime
+PACKAGE=ufs
 PROG=	restore
 LINKS=	${BINDIR}/restore ${BINDIR}/rrestore
 MAN=	restore.8
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
--- a/sbin/tunefs/Makefile
+++ b/sbin/tunefs/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=ufs
 PROG=	tunefs
 SRCS=	tunefs.c getmntopts.c
 LIBADD=	ufs
diff --git a/usr.sbin/snapinfo/Makefile b/usr.sbin/snapinfo/Makefile
--- a/usr.sbin/snapinfo/Makefile
+++ b/usr.sbin/snapinfo/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 #
 
+PACKAGE=	ufs
 PROG=	snapinfo
 MAN=	snapinfo.8