diff --git a/lib/libelftc/Makefile b/lib/libelftc/Makefile
index e25331cee719..7810add76771 100644
--- a/lib/libelftc/Makefile
+++ b/lib/libelftc/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 .include <bsd.own.mk>
 
-PACKAGE=lib${LIB}
 INTERNALLIB=
 
 ELFTCDIR=	${SRCTOP}/contrib/elftoolchain
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index abfbf02328ed..99097d9a46f9 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -54,6 +54,8 @@ ee_COMMENT= 		Easy Editor Utilities
 ee_DESC= 		Easy Editor Utilities
 efi-tools_COMMENT=	UEFI Utilities
 efi-tools_DESC=		UEFI Utilities
+elftoolchain_COMMENT=	ElfToolchain programs and libraries
+elftoolchain_DESC=	ElfToolchain programs and libraries
 fetch_COMMENT=		Fetch Utility
 fetch_DESC=		Fetch Utility
 ftp_COMMENT=		FTP Utilities
diff --git a/usr.bin/addr2line/Makefile b/usr.bin/addr2line/Makefile
index fe9883f97a73..03e35c82df9c 100644
--- a/usr.bin/addr2line/Makefile
+++ b/usr.bin/addr2line/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	elftoolchain
+
 ELFTCDIR=	${SRCTOP}/contrib/elftoolchain
 ADDR2LINEDIR=	${ELFTCDIR}/addr2line
 
diff --git a/usr.bin/cxxfilt/Makefile b/usr.bin/cxxfilt/Makefile
index 75f39419bfd2..4d1a6298d25e 100644
--- a/usr.bin/cxxfilt/Makefile
+++ b/usr.bin/cxxfilt/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	elftoolchain
+
 ELFTCDIR=	${SRCTOP}/contrib/elftoolchain
 SRCDIR=		${ELFTCDIR}/cxxfilt
 
diff --git a/usr.bin/nm/Makefile b/usr.bin/nm/Makefile
index b1b9555962e7..cefe55b7480b 100644
--- a/usr.bin/nm/Makefile
+++ b/usr.bin/nm/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	elftoolchain
+
 ELFTCDIR=	${SRCTOP}/contrib/elftoolchain
 NMDIR=		${ELFTCDIR}/nm
 
diff --git a/usr.bin/objcopy/Makefile b/usr.bin/objcopy/Makefile
index 87472a4cd848..b40dafefe24f 100644
--- a/usr.bin/objcopy/Makefile
+++ b/usr.bin/objcopy/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	elftoolchain
+
 ELFTCDIR=	${SRCTOP}/contrib/elftoolchain
 ELFCOPYDIR=	${ELFTCDIR}/elfcopy
 
diff --git a/usr.bin/readelf/Makefile b/usr.bin/readelf/Makefile
index ed4de3b55745..2c7f1155edda 100644
--- a/usr.bin/readelf/Makefile
+++ b/usr.bin/readelf/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	elftoolchain
+
 ELFTCDIR=	${SRCTOP}/contrib/elftoolchain
 READELFDIR=	${ELFTCDIR}/readelf
 
diff --git a/usr.bin/size/Makefile b/usr.bin/size/Makefile
index 60b62b6c06a8..9622ffd30468 100644
--- a/usr.bin/size/Makefile
+++ b/usr.bin/size/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	elftoolchain
+
 ELFTCDIR=	${SRCTOP}/contrib/elftoolchain
 SIZEDIR=	${ELFTCDIR}/size