Index: cddl/lib/drti/Makefile
===================================================================
--- cddl/lib/drti/Makefile
+++ cddl/lib/drti/Makefile
@@ -2,6 +2,7 @@
 
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common
 
+PACKAGE=libdrti
 SRCS=		drti.c
 FILES=		${SRCS:R:S/$/.o/g}
 FILESOWN=	${LIBOWN}
Index: cddl/lib/libavl/Makefile
===================================================================
--- cddl/lib/libavl/Makefile
+++ cddl/lib/libavl/Makefile
@@ -2,6 +2,7 @@
 
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
 
+PACKAGE=lib${LIB}
 LIB=	avl
 SRCS=	avl.c
 WARNS?=	3
Index: cddl/lib/libctf/Makefile
===================================================================
--- cddl/lib/libctf/Makefile
+++ cddl/lib/libctf/Makefile
@@ -5,6 +5,7 @@
 .PATH:		${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/ctf
 
 LIB=		ctf
+PACKAGE=libctf
 SRCS=		ctf_create.c \
 		ctf_decl.c \
 		ctf_error.c \
Index: cddl/lib/libdtrace/Makefile
===================================================================
--- cddl/lib/libdtrace/Makefile
+++ cddl/lib/libdtrace/Makefile
@@ -4,6 +4,7 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libgen/common
 
 LIB=		dtrace
+PACKAGE=libdtrace
 SRCS=		dt_aggregate.c \
 		dt_as.c \
 		dt_buf.c \
Index: cddl/lib/libnvpair/Makefile
===================================================================
--- cddl/lib/libnvpair/Makefile
+++ cddl/lib/libnvpair/Makefile
@@ -3,7 +3,8 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair
 
-LIB=	nvpair
+LIB=	  nvpair
+PACKAGE=lib${LIB}
 
 SRCS=	libnvpair.c \
 	nvpair_alloc_system.c \
@@ -24,7 +25,7 @@
 
 # This library uses macros to define fprintf behavior for several object types
 # The compiler will see the non-string literal arguments to the fprintf calls and
-# omit warnings for them. Quiesce these warnings in contrib code: 
+# omit warnings for them. Quiesce these warnings in contrib code:
 #
 # cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format
 #   string is not a string literal (potentially insecure) [-Wformat-security]
Index: cddl/lib/libumem/Makefile
===================================================================
--- cddl/lib/libumem/Makefile
+++ cddl/lib/libumem/Makefile
@@ -2,7 +2,8 @@
 
 .PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 
-LIB=	umem
+LIB=	  umem
+PACKAGE=lib${LIB}
 SRCS=	umem.c
 WARNS?=	3
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
Index: cddl/lib/libuutil/Makefile
===================================================================
--- cddl/lib/libuutil/Makefile
+++ cddl/lib/libuutil/Makefile
@@ -3,7 +3,8 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
 
-LIB=	uutil
+LIB=	  uutil
+PACKAGE=lib${LIB}
 SRCS=	avl.c \
 	uu_alloc.c \
 	uu_avl.c \
Index: cddl/lib/libzfs/Makefile
===================================================================
--- cddl/lib/libzfs/Makefile
+++ cddl/lib/libzfs/Makefile
@@ -6,6 +6,7 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
 
 LIB=	zfs
+PACKAGE=libzfs
 LIBADD=	md pthread umem util uutil m avl bsdxml geom nvpair z zfs_core
 SRCS=	deviceid.c \
 	fsshare.c \
Index: cddl/lib/libzfs_core/Makefile
===================================================================
--- cddl/lib/libzfs_core/Makefile
+++ cddl/lib/libzfs_core/Makefile
@@ -7,6 +7,7 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
 
 LIB=	zfs_core
+PACKAGE=libzfs
 LIBADD=	nvpair
 
 SRCS=	libzfs_core.c \
Index: cddl/lib/libzpool/Makefile
===================================================================
--- cddl/lib/libzpool/Makefile
+++ cddl/lib/libzpool/Makefile
@@ -25,6 +25,7 @@
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/unicode
 
 LIB=		zpool
+PACKAGE=libzfs
 
 ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c trim_map.c
 ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/}
Index: cddl/sbin/zfs/Makefile
===================================================================
--- cddl/sbin/zfs/Makefile
+++ cddl/sbin/zfs/Makefile
@@ -2,7 +2,8 @@
 
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs
 
-PROG=	zfs
+PROG=	  zfs
+PACKAGE=zfs
 MAN=	zfs.8
 SRCS=	zfs_main.c zfs_iter.c
 
Index: cddl/sbin/zpool/Makefile
===================================================================
--- cddl/sbin/zpool/Makefile
+++ cddl/sbin/zpool/Makefile
@@ -4,7 +4,8 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 
-PROG=	zpool
+PROG=	  zpool
+PACKAGE=zfs
 MAN=	zpool.8 zpool-features.7
 SRCS=	zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c
 SRCS+=	timestamp.c
Index: cddl/usr.bin/ctfconvert/Makefile
===================================================================
--- cddl/usr.bin/ctfconvert/Makefile
+++ cddl/usr.bin/ctfconvert/Makefile
@@ -4,6 +4,7 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt
 
 PROG=		ctfconvert
+PACKAGE=ctf
 SRCS=		alist.c \
 		ctf.c \
 		ctfconvert.c \
Index: cddl/usr.bin/ctfdump/Makefile
===================================================================
--- cddl/usr.bin/ctfdump/Makefile
+++ cddl/usr.bin/ctfdump/Makefile
@@ -4,6 +4,7 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/dump
 
 PROG=		ctfdump
+PACKAGE=ctf
 SRCS=		dump.c \
 		symbol.c \
 		utils.c
Index: cddl/usr.bin/ctfmerge/Makefile
===================================================================
--- cddl/usr.bin/ctfmerge/Makefile
+++ cddl/usr.bin/ctfmerge/Makefile
@@ -4,6 +4,7 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt
 
 PROG=		ctfmerge
+PACKAGE=ctf
 SRCS=		alist.c \
 		barrier.c \
 		ctf.c \
Index: cddl/usr.bin/zinject/Makefile
===================================================================
--- cddl/usr.bin/zinject/Makefile
+++ cddl/usr.bin/zinject/Makefile
@@ -2,7 +2,8 @@
 
 .PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zinject
 
-PROG=	zinject
+PROG=	  zinject
+PACKAGE=zfs
 SRCS=	zinject.c translate.c
 MAN=
 
Index: cddl/usr.bin/zlook/Makefile
===================================================================
--- cddl/usr.bin/zlook/Makefile
+++ cddl/usr.bin/zlook/Makefile
@@ -2,7 +2,8 @@
 
 .PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zlook
 
-PROG=	zlook
+PROG=	  zlook
+PACKAGE=zfs
 MAN=
 
 WARNS?=	0
Index: cddl/usr.bin/zstreamdump/Makefile
===================================================================
--- cddl/usr.bin/zstreamdump/Makefile
+++ cddl/usr.bin/zstreamdump/Makefile
@@ -2,7 +2,8 @@
 
 .PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/zstreamdump
 
-PROG=	zstreamdump
+PROG=	  zstreamdump
+PACKAGE=zfs
 MAN=	zstreamdump.1
 
 WARNS?=	0
Index: cddl/usr.bin/ztest/Makefile
===================================================================
--- cddl/usr.bin/ztest/Makefile
+++ cddl/usr.bin/ztest/Makefile
@@ -2,7 +2,8 @@
 
 .PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest
 
-PROG=	ztest
+PROG=	  ztest
+PACKAGE=zfs
 MAN=
 
 WARNS?=	0
Index: cddl/usr.sbin/dtrace/Makefile
===================================================================
--- cddl/usr.sbin/dtrace/Makefile
+++ cddl/usr.sbin/dtrace/Makefile
@@ -5,6 +5,7 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/dtrace
 
 PROG=		dtrace
+PACKAGE=dtrace
 SRCS=		dtrace.c
 BINDIR?=	/usr/sbin
 
Index: cddl/usr.sbin/lockstat/Makefile
===================================================================
--- cddl/usr.sbin/lockstat/Makefile
+++ cddl/usr.sbin/lockstat/Makefile
@@ -3,6 +3,7 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/lockstat
 
 PROG=		lockstat
+PACKAGE=dtrace
 SRCS=		lockstat.c sym.c
 BINDIR?=	/usr/sbin
 
Index: cddl/usr.sbin/plockstat/Makefile
===================================================================
--- cddl/usr.sbin/plockstat/Makefile
+++ cddl/usr.sbin/plockstat/Makefile
@@ -3,7 +3,8 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/plockstat
 
 PROG=		plockstat
-SRCS=		plockstat.c 
+PACKAGE=dtrace
+SRCS=		plockstat.c
 BINDIR?=	/usr/sbin
 
 WARNS?=		1
Index: cddl/usr.sbin/zdb/Makefile
===================================================================
--- cddl/usr.sbin/zdb/Makefile
+++ cddl/usr.sbin/zdb/Makefile
@@ -2,9 +2,10 @@
 
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb
 
-PROG=	zdb
-MAN=	zdb.8
-SRCS=	zdb.c zdb_il.c
+PROG=	  zdb
+PACKAGE=zfs
+MAN=	  zdb.8
+SRCS=	  zdb.c zdb_il.c
 
 WARNS?=	0
 CSTD=	c99
Index: cddl/usr.sbin/zfsd/Makefile
===================================================================
--- cddl/usr.sbin/zfsd/Makefile
+++ cddl/usr.sbin/zfsd/Makefile
@@ -3,6 +3,7 @@
 .include "Makefile.common"
 
 PROG_CXX=	zfsd
+PACKAGE = zfs
 MAN=		zfsd.8
 
 .include <bsd.prog.mk>
Index: cddl/usr.sbin/zhack/Makefile
===================================================================
--- cddl/usr.sbin/zhack/Makefile
+++ cddl/usr.sbin/zhack/Makefile
@@ -2,7 +2,8 @@
 
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zhack
 
-PROG=	zhack
+PROG=	  zhack
+PACKAGE=zfs
 MAN=
 
 WARNS?=	0