diff --git a/cddl/usr.sbin/dwatch/Makefile b/cddl/usr.sbin/dwatch/Makefile
index 647f07388890..aa2873ec4681 100644
--- a/cddl/usr.sbin/dwatch/Makefile
+++ b/cddl/usr.sbin/dwatch/Makefile
@@ -1,15 +1,17 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
+PACKAGE=	dwatch
+
 SUBDIR= libexec
 
 .if ${MK_EXAMPLES} != "no"
 SUBDIR+= examples
 .endif
 
 SCRIPTS= dwatch
 
 MAN= dwatch.1
 
 .include <bsd.prog.mk>
diff --git a/cddl/usr.sbin/dwatch/examples/Makefile b/cddl/usr.sbin/dwatch/examples/Makefile
index 33364044942f..344d67d27ec8 100644
--- a/cddl/usr.sbin/dwatch/examples/Makefile
+++ b/cddl/usr.sbin/dwatch/examples/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	dwatch
 FILESDIR=	${SHAREDIR}/examples/dwatch
 FILES=		profile_template
 
 .include <bsd.prog.mk>
diff --git a/cddl/usr.sbin/dwatch/libexec/Makefile b/cddl/usr.sbin/dwatch/libexec/Makefile
index d84fc370519b..581556eeebd0 100644
--- a/cddl/usr.sbin/dwatch/libexec/Makefile
+++ b/cddl/usr.sbin/dwatch/libexec/Makefile
@@ -1,91 +1,92 @@
 # $FreeBSD$
 
+PACKAGE=	dwatch
 FILESDIR=	${LIBEXECDIR}/dwatch
 FILES=		chmod \
 		errno \
 		io \
 		ip \
 		kill \
 		nanosleep \
 		open \
 		proc \
 		rw \
 		sched \
 		sendrecv \
 		systop \
 		tcp \
 		udp \
 		udplite \
 		vop_create \
 		vop_readdir \
 		vop_rename \
 		vop_symlink
 
 LINKS=	${LIBEXECDIR}/dwatch/chmod ${LIBEXECDIR}/dwatch/fchmodat
 LINKS+=	${LIBEXECDIR}/dwatch/chmod ${LIBEXECDIR}/dwatch/lchmod
 LINKS+=	${LIBEXECDIR}/dwatch/io ${LIBEXECDIR}/dwatch/io-done
 LINKS+=	${LIBEXECDIR}/dwatch/io ${LIBEXECDIR}/dwatch/io-start
 LINKS+=	${LIBEXECDIR}/dwatch/ip ${LIBEXECDIR}/dwatch/ip-receive
 LINKS+=	${LIBEXECDIR}/dwatch/ip ${LIBEXECDIR}/dwatch/ip-send
 LINKS+=	${LIBEXECDIR}/dwatch/open ${LIBEXECDIR}/dwatch/openat
 LINKS+=	${LIBEXECDIR}/dwatch/proc ${LIBEXECDIR}/dwatch/proc-create
 LINKS+=	${LIBEXECDIR}/dwatch/proc ${LIBEXECDIR}/dwatch/proc-exec
 LINKS+=	${LIBEXECDIR}/dwatch/proc ${LIBEXECDIR}/dwatch/proc-exec-failure
 LINKS+=	${LIBEXECDIR}/dwatch/proc ${LIBEXECDIR}/dwatch/proc-exec-success
 LINKS+=	${LIBEXECDIR}/dwatch/proc ${LIBEXECDIR}/dwatch/proc-exit
 LINKS+=	${LIBEXECDIR}/dwatch/proc ${LIBEXECDIR}/dwatch/proc-signal
 LINKS+=	${LIBEXECDIR}/dwatch/proc ${LIBEXECDIR}/dwatch/proc-signal-clear
 LINKS+=	${LIBEXECDIR}/dwatch/proc ${LIBEXECDIR}/dwatch/proc-signal-discard
 LINKS+=	${LIBEXECDIR}/dwatch/proc ${LIBEXECDIR}/dwatch/proc-signal-send
 LINKS+=	${LIBEXECDIR}/dwatch/proc ${LIBEXECDIR}/dwatch/proc-status
 LINKS+=	${LIBEXECDIR}/dwatch/rw ${LIBEXECDIR}/dwatch/read
 LINKS+=	${LIBEXECDIR}/dwatch/rw ${LIBEXECDIR}/dwatch/write
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-change-pri
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-cpu
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-dequeue
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-enqueue
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-exec
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-lend-pri
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-load-change
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-off-cpu
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-on-cpu
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-preempt
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-pri
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-queue
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-remain-cpu
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-sleep
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-surrender
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-tick
 LINKS+=	${LIBEXECDIR}/dwatch/sched ${LIBEXECDIR}/dwatch/sched-wakeup
 LINKS+=	${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/recv
 LINKS+=	${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/recvfrom
 LINKS+=	${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/recvmsg
 LINKS+=	${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/send
 LINKS+=	${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/sendmsg
 LINKS+=	${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/sendto
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-accept
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-accept-established
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-accept-refused
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-connect
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-connect-established
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-connect-refused
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-connect-request
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-established
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-init
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-io
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-receive
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-refused
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-send
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-state-change
 LINKS+=	${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-status
 LINKS+=	${LIBEXECDIR}/dwatch/udp ${LIBEXECDIR}/dwatch/udp-receive
 LINKS+=	${LIBEXECDIR}/dwatch/udp ${LIBEXECDIR}/dwatch/udp-send
 LINKS+=	${LIBEXECDIR}/dwatch/udplite ${LIBEXECDIR}/dwatch/udplite-receive
 LINKS+=	${LIBEXECDIR}/dwatch/udplite ${LIBEXECDIR}/dwatch/udplite-send
 LINKS+=	${LIBEXECDIR}/dwatch/vop_create ${LIBEXECDIR}/dwatch/vop_lookup
 LINKS+=	${LIBEXECDIR}/dwatch/vop_create ${LIBEXECDIR}/dwatch/vop_mkdir
 LINKS+=	${LIBEXECDIR}/dwatch/vop_create ${LIBEXECDIR}/dwatch/vop_mknod
 LINKS+=	${LIBEXECDIR}/dwatch/vop_create ${LIBEXECDIR}/dwatch/vop_remove
 LINKS+=	${LIBEXECDIR}/dwatch/vop_create ${LIBEXECDIR}/dwatch/vop_rmdir
 
 .include <bsd.prog.mk>
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index b5957f8d5b53..04c8ef0536f0 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -1,106 +1,108 @@
 #
 # $FreeBSD$
 #
 
 acct_COMMENT= 		System Accounting Utilities
 acct_DESC= 		System Accounting Utilities
 acpi_COMMENT= 		ACPI Utilities
 acpi_DESC= 		ACPI Utilities
 amd_COMMENT= 		AMD Utilities
 amd_DESC= 		AMD Utilities
 apm_COMMENT= 		APM Utilities
 apm_DESC= 		APM Utilities
 at_COMMENT= 		AT Utilities
 at_DESC= 		AT Utilities
 autofs_COMMENT= 	Autofs Utilities
 autofs_DESC= 		Autofs Utilities
 bhyve_COMMENT= 		Bhyve Utilities
 bhyve_DESC= 		Bhyve Utilities
 binutils_COMMENT= 	Binutils
 binutils_DESC= 		Binutils
 bluetooth_COMMENT=	Bluetooth Utilities
 bluetooth_DESC=		Bluetooth Utilities
 bootloader_COMMENT=	Bootloader
 bootloader_DESC=	Bootloader and configuration files
 bsdinstall_COMMENT= 	BSDInstall Utilities
 bsdinstall_DESC= 	BSDInstall Utilities
 bsnmp_COMMENT= 		BSNMP Utilities
 bsnmp_DESC= 		BSNMP Utilities
 clang_COMMENT= 		Clang Utilities
 clang_DESC= 		Clang Utilities
 clibs_COMMENT= 		Core C Libraries
 clibs_DESC= 		Core C Libraries
 cxgbe-tools_COMMENT=	Chelsio cxbge Utilities
 cxgbe-tools_DESC=	Chelsio cxbge Utilities
 dma_COMMENT= 		DMA Mail Agent Utilities
 dma_DESC= 		DMA Mail Agent Utilities
 docs_COMMENT= 		Documentation
 docs_DESC= 		Documentation
 dtrace_COMMENT=		Dtrace Utilities
 dtrace_DESC=		Dtrace Utilities
+dwatch_COMMENT=		Dwatch Utilities
+dwatch_DESC=		Dwatch Utilities
 ee_COMMENT= 		Easy Editor Utilities
 ee_DESC= 		Easy Editor Utilities
 gdb_COMMENT= 		GDB Utilities
 gdb_DESC= 		GDB Utilities
 ggate_COMMENT=		GEOM Gate Utilities
 ggate_DESC=		GEOM Gate Utilities
 groff_COMMENT= 		Groff Utilities
 groff_DESC= 		Groff Utilities
 hast_COMMENT= 		Highly Available Storage daemon
 hast_DESC= 		Highly Available Storage daemon
 hostapd_COMMENT=	802.11 Access Point Daemon an Utilities
 hostapd_DESC=		802.11 Access Point Daemon an Utilities
 jail_COMMENT= 		Jail Utilities
 jail_DESC= 		Jail Utilities
 jail-debug_DESCR= 	Debugging Symbols
 jail-development_DESCR=Development Files
 jail-profile_DESCR= 	Profiling Libraries
 jail-lib32_DESCR= 	32-bit Libraries
 jail-lib32-debug_DESCR=32-bit Debugging Symbols
 jail-lib32-development_DESCR=32-bit Development Files
 jail-lib32-profile_DESCR=32-bit Profiling Libraries
 kernel_COMMENT= 	FreeBSD Kernel
 kernel_DESC= 		FreeBSD Kernel
 manuals_COMMENT= 	Manual Pages
 manuals_DESC= 		Manual Pages
 mlx-tools_COMMENT=	Mellanox Utilities
 mlx-tools_DESC=		Mellanox Utilities
 nfs_COMMENT=		NFS Utilities
 nfs_DESC= 		NFS Utilities
 openssl_COMMENT=	OpenSSL Library and Utility
 openssl_DESC=		OpenSSL Library and Utility
 rc_COMMENT= 		RC Scripts
 rc_DESC= 		RC Scripts
 rcmds_COMMENT= 		Remote Command Utilities
 rcmds_DESC= 		Remote Command Utilities
 rescue_COMMENT= 	Rescue Utilities
 rescue_DESC= 		Rescue Utilities
 runtime_COMMENT= 	FreeBSD Base System
 runtime_DESC= 		FreeBSD Base System
 runtime-debug_DESCR= 	Debugging Symbols
 runtime-development_DESCR=Development Files
 runtime-profile_DESCR= 	Profiling Libraries
 runtime-lib32_DESCR= 	32-bit Libraries
 runtime-lib32-debug_DESCR=32-bit Debugging Symbols
 runtime-lib32-development_DESCR=32-bit Development Files
 runtime-lib32-profile_DESCR=32-bit Profiling Libraries
 sendmail_COMMENT= 	Sendmail Utilities
 sendmail_DESC= 		Sendmail Utilities
 ssh_COMMENT= 		Secure Shell Utilities
 ssh_DESC= 		Secure Shell Utilities
 svn_COMMENT= 		Subversion Version Control System
 svn_DESC= 		Subversion Version Control System
 syscons_COMMENT= 	Syscons Console
 syscons_DESC= 		Syscons Console
 telnet_COMMENT=		Telnet and telnetd
 telnet_DESC=		Telnet and telnetd
 tests_COMMENT= 		Test Suite
 tests_DESC= 		Test Suite
 unbound_COMMENT= 	Unbound DNS Resolver
 unbound_DESC= 		Unbound DNS Resolver
 utilities_COMMENT=	Non-vital programs and librairies
 utilities_DESC=		Non-vital programs and librairies
 vi_COMMENT= 		Vi Editor
 vi_DESC= 		Vi Editor
 wpa_COMMENT=		802.11 Supplicant
 wpa_DESC=		802.11 Supplicant