Index: lib/geom/cache/Makefile
===================================================================
--- lib/geom/cache/Makefile
+++ lib/geom/cache/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	cache
Index: lib/geom/concat/Makefile
===================================================================
--- lib/geom/concat/Makefile
+++ lib/geom/concat/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	concat
Index: lib/geom/eli/Makefile
===================================================================
--- lib/geom/eli/Makefile
+++ lib/geom/eli/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2
 
 GEOM_CLASS=	eli
Index: lib/geom/journal/Makefile
===================================================================
--- lib/geom/journal/Makefile
+++ lib/geom/journal/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	journal
Index: lib/geom/label/Makefile
===================================================================
--- lib/geom/label/Makefile
+++ lib/geom/label/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	label
Index: lib/geom/mirror/Makefile
===================================================================
--- lib/geom/mirror/Makefile
+++ lib/geom/mirror/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	mirror
Index: lib/geom/mountver/Makefile
===================================================================
--- lib/geom/mountver/Makefile
+++ lib/geom/mountver/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	mountver
Index: lib/geom/multipath/Makefile
===================================================================
--- lib/geom/multipath/Makefile
+++ lib/geom/multipath/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	multipath
Index: lib/geom/nop/Makefile
===================================================================
--- lib/geom/nop/Makefile
+++ lib/geom/nop/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	nop
Index: lib/geom/part/Makefile
===================================================================
--- lib/geom/part/Makefile
+++ lib/geom/part/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	part
Index: lib/geom/raid/Makefile
===================================================================
--- lib/geom/raid/Makefile
+++ lib/geom/raid/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	raid
Index: lib/geom/raid3/Makefile
===================================================================
--- lib/geom/raid3/Makefile
+++ lib/geom/raid3/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	raid3
Index: lib/geom/shsec/Makefile
===================================================================
--- lib/geom/shsec/Makefile
+++ lib/geom/shsec/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	shsec
Index: lib/geom/stripe/Makefile
===================================================================
--- lib/geom/stripe/Makefile
+++ lib/geom/stripe/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	stripe
Index: lib/geom/union/Makefile
===================================================================
--- lib/geom/union/Makefile
+++ lib/geom/union/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	union
Index: lib/geom/virstor/Makefile
===================================================================
--- lib/geom/virstor/Makefile
+++ lib/geom/virstor/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 .PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/virstor
 
 GEOM_CLASS=	virstor
Index: release/packages/Makefile.package
===================================================================
--- release/packages/Makefile.package
+++ release/packages/Makefile.package
@@ -56,6 +56,8 @@
 ftpd_DESC=		FTP Daemon
 gdb_COMMENT= 		GDB Utilities
 gdb_DESC= 		GDB Utilities
+geom_COMMENT=		GEOM Utilitites
+geom_DESC=		GEOM Utilitites
 ggate_COMMENT=		GEOM Gate Utilities
 ggate_DESC=		GEOM Gate Utilities
 groff_COMMENT= 		Groff Utilities
Index: sbin/gbde/Makefile
===================================================================
--- sbin/gbde/Makefile
+++ sbin/gbde/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 PROG=	gbde
 SRCS=	gbde.c template.c
 SRCS+=	rijndael-alg-fst.c
Index: sbin/geom/Makefile
===================================================================
--- sbin/geom/Makefile
+++ sbin/geom/Makefile
@@ -4,7 +4,7 @@
 
 .PATH: ${.CURDIR}/core ${.CURDIR}/misc
 
-PACKAGE=runtime
+PACKAGE=geom
 PROG=		geom
 SRCS=		geom.c subr.c
 MAN=		geom.8
Index: sbin/gvinum/Makefile
===================================================================
--- sbin/gvinum/Makefile
+++ sbin/gvinum/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=geom
 PROG=	gvinum
 SRCS=	gvinum.c gvinum.h geom_vinum_share.c
 MAN=	gvinum.8