diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 988d54d795d7..59121ee08479 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -89,6 +89,8 @@ newsyslog_COMMENT=	Newsyslog Utility
 newsyslog_DESC=		Newsyslog Utility
 nfs_COMMENT=		NFS Utilities
 nfs_DESC= 		NFS Utilities
+nvme-tools_COMMENT=	NVME Utilities
+nvme-tools_DESC=	NVME Utilities
 openssl_COMMENT=	OpenSSL Library and Utility
 openssl_DESC=		OpenSSL Library and Utility
 pkg-bootstrap_COMMENT=	pkg bootstrap Utility
diff --git a/sbin/nvmecontrol/Makefile b/sbin/nvmecontrol/Makefile
index b5ceb350ed0d..ac71e1aeaa42 100644
--- a/sbin/nvmecontrol/Makefile
+++ b/sbin/nvmecontrol/Makefile
@@ -2,7 +2,7 @@
 
 .include <src.opts.mk>
 
-PACKAGE=runtime
+PACKAGE=nvme-tools
 PROG=	nvmecontrol
 SRCS=	comnd.c nvmecontrol.c
 SRCS+=	devlist.c firmware.c format.c identify.c logpage.c ns.c nsid.c
diff --git a/sbin/nvmecontrol/modules/Makefile.inc b/sbin/nvmecontrol/modules/Makefile.inc
index bdc25f711a67..57b6b074202a 100644
--- a/sbin/nvmecontrol/modules/Makefile.inc
+++ b/sbin/nvmecontrol/modules/Makefile.inc
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=runtime
+PACKAGE=nvme-tools
 NVMECONTROLDIR=	${SRCTOP}/sbin/nvmecontrol
 
 MK_INSTALLLIB=	no