diff --git a/contrib/telnet/telnet/telnet.1 b/contrib/telnet/telnet/telnet.1
--- a/contrib/telnet/telnet/telnet.1
+++ b/contrib/telnet/telnet/telnet.1
@@ -28,7 +28,7 @@
 .\"	@(#)telnet.1	8.6 (Berkeley) 6/1/94
 .\" $FreeBSD$
 .\"
-.Dd June 21, 2021
+.Dd September 29, 2022
 .Dt TELNET 1
 .Os
 .Sh NAME
@@ -1465,7 +1465,7 @@
 .Xr rsh 1 ,
 .Xr hosts 5 ,
 .Xr nologin 5 ,
-.Xr telnetd 8
+.Xr telnetd 8 Pq Pa ports/net/freebsd-telnetd
 .Sh HISTORY
 The
 .Nm
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -28,7 +28,7 @@
 .\"     from: @(#)gettytab.5	8.4 (Berkeley) 4/19/94
 .\" $FreeBSD$
 .\" "
-.Dd February 26, 2018
+.Dd September 29, 2022
 .Dt GETTYTAB 5
 .Os
 .Sh NAME
@@ -492,8 +492,7 @@
 .Xr gethostname 3 ,
 .Xr uname 3 ,
 .Xr termcap 5 ,
-.Xr getty 8 ,
-.Xr telnetd 8
+.Xr getty 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
 .\" $FreeBSD$
-.Dd September 9, 2022
+.Dd September 29, 2022
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -843,9 +843,8 @@
 Build some programs without Kerberos support, like
 .Xr ssh 1 ,
 .Xr telnet 1 ,
-.Xr sshd 8 ,
 and
-.Xr telnetd 8 .
+.Xr sshd 8 .
 .It Va WITH_KERNEL_RETPOLINE
 Enable the "retpoline" mitigation for CVE-2017-5715 in the kernel
 build.
diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
--- a/share/man/man7/security.7
+++ b/share/man/man7/security.7
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 14, 2022
+.Dd September 29, 2022
 .Dt SECURITY 7
 .Os
 .Sh NAME
@@ -97,9 +97,9 @@
 pipe.
 .Pp
 A user account compromise is even more common than a DoS attack.
-Many
-sysadmins still run standard
-.Xr telnetd 8
+Some
+sysadmins still run
+.Nm telnetd
 and
 .Xr ftpd 8
 servers on their machines.
@@ -338,8 +338,8 @@
 If you are running a machine through which people only log in via
 .Xr sshd 8
 and never log in via
-.Xr telnetd 8
-then turn off those services!
+.Nm telnetd
+then turn off this service!
 .Pp
 .Fx
 now defaults to running
diff --git a/tools/build/options/WITHOUT_KERBEROS_SUPPORT b/tools/build/options/WITHOUT_KERBEROS_SUPPORT
--- a/tools/build/options/WITHOUT_KERBEROS_SUPPORT
+++ b/tools/build/options/WITHOUT_KERBEROS_SUPPORT
@@ -2,6 +2,5 @@
 Build some programs without Kerberos support, like
 .Xr ssh 1 ,
 .Xr telnet 1 ,
-.Xr sshd 8 ,
 and
-.Xr telnetd 8 .
+.Xr sshd 8 .
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -28,7 +28,7 @@
 .\"	@(#)login.1	8.2 (Berkeley) 5/5/94
 .\" $FreeBSD$
 .\"
-.Dd July 20, 2019
+.Dd September 29, 2022
 .Dt LOGIN 1
 .Os
 .Sh NAME
@@ -63,7 +63,7 @@
 .It Fl h
 Specify the host from which the connection was received.
 It is used by various daemons such as
-.Xr telnetd 8 .
+.Nm telnetd .
 This option may only be used by the super-user.
 .It Fl p
 By default,
diff --git a/usr.sbin/dconschat/dconschat.8 b/usr.sbin/dconschat/dconschat.8
--- a/usr.sbin/dconschat/dconschat.8
+++ b/usr.sbin/dconschat/dconschat.8
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .\"
-.Dd February 11, 2003
+.Dd September 29, 2022
 .Dt DCONSCHAT 8
 .Os
 .Sh NAME
@@ -104,7 +104,7 @@
 acts as a slave device and
 .Nm
 acts as a master device with
-.Xr telnetd 8 .
+.Nm telnetd .
 .Pp
 Typed characters are normally transmitted directly to
 .Xr dcons 4 .
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -28,7 +28,7 @@
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
 .\" $FreeBSD$
 .\"
-.Dd December 6, 2021
+.Dd September 29, 2022
 .Dt INETD 8
 .Os
 .Sh NAME
@@ -964,7 +964,7 @@
 .Xr prometheus_sysctl_exporter 8 ,
 .Xr smbd 8 Pq Pa ports/net/samba412 ,
 .Xr talkd 8 ,
-.Xr telnetd 8 ,
+.Xr telnetd 8 Pq Pa ports/net/freebsd-telnetd ,
 .Xr tftpd 8 ,
 .Xr uucpd 8 Pq Pa ports/net/freebsd-uucp
 .Rs