diff --git a/lib/libefivar/Makefile b/lib/libefivar/Makefile
--- a/lib/libefivar/Makefile
+++ b/lib/libefivar/Makefile
@@ -31,7 +31,7 @@
 
 .PATH:	${EFIBOOT}/libefi
 
-PACKAGE=lib${LIB}
+PACKAGE=	efi-tools
 LIB=		efivar
 SRCS=		efivar.c efichar.c efivar-dp-format.c \
 		efivar-dp-parse.c \
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -42,6 +42,8 @@
 dwatch_DESC=		Dwatch Utilities
 ee_COMMENT= 		Easy Editor Utilities
 ee_DESC= 		Easy Editor Utilities
+efi-tools_COMMENT=	UEFI Utilities
+efi-tools_DESC=		UEFI Utilities
 gdb_COMMENT= 		GDB Utilities
 gdb_DESC= 		GDB Utilities
 ggate_COMMENT=		GEOM Gate Utilities
diff --git a/usr.sbin/efibootmgr/Makefile b/usr.sbin/efibootmgr/Makefile
--- a/usr.sbin/efibootmgr/Makefile
+++ b/usr.sbin/efibootmgr/Makefile
@@ -5,6 +5,8 @@
 .PATH: ${EFIBOOT}/libefi ${EFIVAR}
 CFLAGS+= -I${EFIVAR} -I${EFIINCL}
 
+PACKAGE=	efi-tools
+
 PROG=efibootmgr
 MAN=	efibootmgr.8
 SRCS= efichar.c efiutil.c efibootmgr.c
diff --git a/usr.sbin/efidp/Makefile b/usr.sbin/efidp/Makefile
--- a/usr.sbin/efidp/Makefile
+++ b/usr.sbin/efidp/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	efi-tools
+
 PROG=	efidp
 MAN=	efidp.8
 
diff --git a/usr.sbin/efitable/Makefile b/usr.sbin/efitable/Makefile
--- a/usr.sbin/efitable/Makefile
+++ b/usr.sbin/efitable/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	efi-tools
+
 PROG=	efitable
 MAN=	efitable.8
 SRCS=	efitable.c
diff --git a/usr.sbin/efivar/Makefile b/usr.sbin/efivar/Makefile
--- a/usr.sbin/efivar/Makefile
+++ b/usr.sbin/efivar/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	efi-tools
+
 PROG=	efivar
 MAN=	efivar.8