diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile
--- a/libexec/rpc.rquotad/Makefile
+++ b/libexec/rpc.rquotad/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	nfs
+
 PROG =	rpc.rquotad
 SRCS =	rquotad.c
 MAN  =	rpc.rquotad.8
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -59,6 +59,8 @@
 kernel_DESC= 		FreeBSD Kernel
 manuals_COMMENT= 	Manual Pages
 manuals_DESC= 		Manual Pages
+nfs_COMMENT=		NFS Utilities
+nfs_DESC= 		NFS Utilities
 openssl_COMMENT=	OpenSSL Library and Utility
 openssl_DESC=		OpenSSL Library and Utility
 rc_COMMENT= 		RC Scripts
diff --git a/usr.bin/nfsstat/Makefile b/usr.bin/nfsstat/Makefile
--- a/usr.bin/nfsstat/Makefile
+++ b/usr.bin/nfsstat/Makefile
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+PACKAGE=	nfs
+
 PROG=	nfsstat
 CFLAGS+=-DNFS
 
diff --git a/usr.sbin/clear_locks/Makefile b/usr.sbin/clear_locks/Makefile
--- a/usr.sbin/clear_locks/Makefile
+++ b/usr.sbin/clear_locks/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	nfs
+
 PROG=	clear_locks
 MAN=	clear_locks.8
 LIBADD=	rpcsvc
diff --git a/usr.sbin/nfscbd/Makefile b/usr.sbin/nfscbd/Makefile
--- a/usr.sbin/nfscbd/Makefile
+++ b/usr.sbin/nfscbd/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	nfs
+
 PROG=	nfscbd
 MAN=	nfscbd.8
 
diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile
--- a/usr.sbin/nfsd/Makefile
+++ b/usr.sbin/nfsd/Makefile
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
+PACKAGE=	nfs
+
 PROG=	nfsd
 MAN=	nfsd.8 nfsv4.4 stablerestart.5 pnfs.4 pnfsserver.4
 
diff --git a/usr.sbin/nfsdumpstate/Makefile b/usr.sbin/nfsdumpstate/Makefile
--- a/usr.sbin/nfsdumpstate/Makefile
+++ b/usr.sbin/nfsdumpstate/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	nfs
+
 PROG=	nfsdumpstate
 MAN=	nfsdumpstate.8
 
diff --git a/usr.sbin/nfsrevoke/Makefile b/usr.sbin/nfsrevoke/Makefile
--- a/usr.sbin/nfsrevoke/Makefile
+++ b/usr.sbin/nfsrevoke/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	nfs
+
 PROG=	nfsrevoke
 MAN=	nfsrevoke.8
 
diff --git a/usr.sbin/nfsuserd/Makefile b/usr.sbin/nfsuserd/Makefile
--- a/usr.sbin/nfsuserd/Makefile
+++ b/usr.sbin/nfsuserd/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	nfs
+
 PROG=	nfsuserd
 MAN=	nfsuserd.8
 WARNS?=	3
diff --git a/usr.sbin/pnfsdscopymr/Makefile b/usr.sbin/pnfsdscopymr/Makefile
--- a/usr.sbin/pnfsdscopymr/Makefile
+++ b/usr.sbin/pnfsdscopymr/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	nfs
+
 PROG=	pnfsdscopymr
 MAN=	pnfsdscopymr.8
 
diff --git a/usr.sbin/pnfsdsfile/Makefile b/usr.sbin/pnfsdsfile/Makefile
--- a/usr.sbin/pnfsdsfile/Makefile
+++ b/usr.sbin/pnfsdsfile/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	nfs
+
 PROG=	pnfsdsfile
 MAN=	pnfsdsfile.8
 
diff --git a/usr.sbin/pnfsdskill/Makefile b/usr.sbin/pnfsdskill/Makefile
--- a/usr.sbin/pnfsdskill/Makefile
+++ b/usr.sbin/pnfsdskill/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	nfs
+
 PROG=	pnfsdskill
 MAN=	pnfsdskill.8
 
diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile
--- a/usr.sbin/rpc.lockd/Makefile
+++ b/usr.sbin/rpc.lockd/Makefile
@@ -1,6 +1,8 @@
 #	$NetBSD: Makefile,v 1.12 2000/08/07 16:23:31 thorpej Exp $
 # $FreeBSD$
 
+PACKAGE=	nfs
+
 PROG=	rpc.lockd
 MAN=	rpc.lockd.8
 MLINKS=	rpc.lockd.8 lockd.8
diff --git a/usr.sbin/rpc.umntall/Makefile b/usr.sbin/rpc.umntall/Makefile
--- a/usr.sbin/rpc.umntall/Makefile
+++ b/usr.sbin/rpc.umntall/Makefile
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.4 (Berkeley) 6/22/95
 # $FreeBSD$
 
+PACKAGE=	nfs
+
 PROG=	rpc.umntall
 MAN=	rpc.umntall.8
 SRCS=	rpc.umntall.c mounttab.c