diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile
--- a/bin/domainname/Makefile
+++ b/bin/domainname/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=yp
 PROG=	domainname
 
 .include <bsd.prog.mk>
diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile
--- a/lib/libypclnt/Makefile
+++ b/lib/libypclnt/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	yp
 LIB=	ypclnt
 SHLIB_MAJOR= 4
 SRCS=	ypclnt_connect.c \
diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile
--- a/libexec/ypxfr/Makefile
+++ b/libexec/ypxfr/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	yp
 PROG=	ypxfr
 SRCS=	yp_dblookup.c yp_dbwrite.c yp_error.c \
 	ypxfr_getmap.c ypxfr_main.c ypxfr_misc.c \
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -118,3 +118,5 @@
 vt_DESC=		VT fonts and keyboard files
 wpa_COMMENT=		802.11 Supplicant
 wpa_DESC=		802.11 Supplicant
+yp_COMMENT=		Yellow Pages programs
+yp_DESC=		Yellow Pages programs
diff --git a/usr.bin/ypcat/Makefile b/usr.bin/ypcat/Makefile
--- a/usr.bin/ypcat/Makefile
+++ b/usr.bin/ypcat/Makefile
@@ -1,6 +1,7 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
 # $FreeBSD$
 
+PACKAGE=	yp
 PROG=	ypcat
 
 WARNS?=	3
diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile
--- a/usr.bin/ypmatch/Makefile
+++ b/usr.bin/ypmatch/Makefile
@@ -1,6 +1,7 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
 # $FreeBSD$
 
+PACKAGE=	yp
 PROG=	ypmatch
 
 WARNS?=	3
diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile
--- a/usr.bin/ypwhich/Makefile
+++ b/usr.bin/ypwhich/Makefile
@@ -4,6 +4,7 @@
 YPSERV=${SRCTOP}/usr.sbin/ypserv/common
 .PATH: ${YPSERV}
 
+PACKAGE=	yp
 PROG=	ypwhich
 SRCS=	yplib_host.c ypwhich.c
 
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/usr.sbin/rpc.yppasswdd/Makefile
@@ -5,6 +5,7 @@
 .PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/usr.bin/chpass \
        ${SRCTOP}/libexec/ypxfr ${RPCDIR}
 
+PACKAGE=yp
 PROG=	rpc.yppasswdd
 SCRIPTS=yppwupdate
 SCRIPTSDIR= ${LIBEXECDIR}
diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile
--- a/usr.sbin/rpc.ypupdated/Makefile
+++ b/usr.sbin/rpc.ypupdated/Makefile
@@ -2,6 +2,7 @@
 
 .PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr
 
+PACKAGE=yp
 PROG=	rpc.ypupdated
 MAN=
 SRCS=	ypupdate_prot_svc.c ypupdate_prot.h ypupdated_main.c \
diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile
--- a/usr.sbin/rpc.ypxfrd/Makefile
+++ b/usr.sbin/rpc.ypxfrd/Makefile
@@ -2,6 +2,7 @@
 
 .PATH: ${SRCTOP}/usr.sbin/ypserv
 
+PACKAGE=yp
 PROG=	rpc.ypxfrd
 MAN=	rpc.ypxfrd.8
 SRCS=	ypxfrd_svc.c ypxfrd.h ypxfrd_server.c yp_error.c \
diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile
--- a/usr.sbin/yp_mkdb/Makefile
+++ b/usr.sbin/yp_mkdb/Makefile
@@ -2,6 +2,7 @@
 
 .PATH: ${SRCTOP}/libexec/ypxfr ${SRCTOP}/usr.sbin/ypserv
 
+PACKAGE=	yp
 PROG=	yp_mkdb
 MAN=	yp_mkdb.8
 SRCS=	yp_mkdb.c yp_dblookup.c yp_dbwrite.c
diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile
--- a/usr.sbin/ypbind/Makefile
+++ b/usr.sbin/ypbind/Makefile
@@ -1,6 +1,7 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
 # $FreeBSD$
 
+PACKAGE=	yp
 PROG=	ypbind
 MAN=	ypbind.8
 SRCS=	ypbind.c yp_ping.c
diff --git a/usr.sbin/ypldap/Makefile b/usr.sbin/ypldap/Makefile
--- a/usr.sbin/ypldap/Makefile
+++ b/usr.sbin/ypldap/Makefile
@@ -1,6 +1,7 @@
 # $OpenBSD: Makefile,v 1.8 2015/09/09 15:33:18 deraadt Exp $
 # $FreeBSD$
 
+PACKAGE=	yp
 PROG=		ypldap
 SRCS=		parse.y ypldap.c log.c	\
 		ldapclient.c entries.c yp.c \
diff --git a/usr.sbin/yppoll/Makefile b/usr.sbin/yppoll/Makefile
--- a/usr.sbin/yppoll/Makefile
+++ b/usr.sbin/yppoll/Makefile
@@ -1,6 +1,7 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
 # $FreeBSD$
 
+PACKAGE=	yp
 PROG=	yppoll
 MAN=	yppoll.8
 
diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile
--- a/usr.sbin/yppush/Makefile
+++ b/usr.sbin/yppush/Makefile
@@ -3,6 +3,7 @@
 RPCDIR=	${SRCTOP}/include/rpcsvc
 .PATH: ${RPCDIR} ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr
 
+PACKAGE=	yp
 PROG=	yppush
 MAN=	yppush.8
 SRCS=	ypxfr_getmap.c yp_dblookup.c yp_error.c ypxfr_misc.c yppush_main.c \
diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile
--- a/usr.sbin/ypserv/Makefile
+++ b/usr.sbin/ypserv/Makefile
@@ -5,6 +5,7 @@
 RPCDIR=	${SRCTOP}/include/rpcsvc
 .PATH: ${RPCDIR} ${.CURDIR}/common
 
+PACKAGE=	yp
 PROG=	ypserv
 MAN=	ypserv.8 ypinit.8
 SRCS=	yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \
diff --git a/usr.sbin/ypset/Makefile b/usr.sbin/ypset/Makefile
--- a/usr.sbin/ypset/Makefile
+++ b/usr.sbin/ypset/Makefile
@@ -1,6 +1,7 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
 # $FreeBSD$
 
+PACKAGE=	yp
 PROG=	ypset
 MAN=	ypset.8