diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile
index 43e43780ee3..1a9caeef940 100644
--- a/lib/libpam/pam.d/Makefile
+++ b/lib/libpam/pam.d/Makefile
@@ -34,6 +34,7 @@ afterinstallconfig:
 .if ${MK_TELNET} != "no"
 CONFGROUPS+=	TELNET
 TELNET+=	telnetd
+TELNETPACKAGE=	telnet
 .endif
 
 .include <bsd.prog.mk>
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 24119797ec8..15dc0af01f0 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -5,6 +5,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	telnet
+
 TELNETDIR=	${SRCTOP}/contrib/telnet
 .PATH:		${TELNETDIR}/telnetd
 
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 254a0fa5afb..f38644c84d3 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -88,6 +88,8 @@ 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
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index cb5d886e9d3..33c8b9cba19 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	telnet
+
 TELNETDIR=	${SRCTOP}/contrib/telnet
 .PATH:		${TELNETDIR}/telnet