diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8
index c8474d2582e5..96bd24cbb6d2 100644
--- a/libexec/tftpd/tftpd.8
+++ b/libexec/tftpd/tftpd.8
@@ -293,6 +293,12 @@ was introduced in
 support for the TFTP Blocksize Option (RFC2348) and the blksize2 option
 was introduced in
 .Fx 7.4 .
+.Pp
+Edwin Groothuis <edwin@FreeBSD.org> performed a major rewrite of the
+.Nm
+and
+.Xr tftp 1
+code to support RFC2348.
 .Sh NOTES
 Files larger than 33488896 octets (65535 blocks) cannot be transferred
 without client and server supporting the TFTP blocksize option (RFC2348),
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index 8c583525b20a..02709c0c09ce 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -218,7 +218,7 @@ Toggle packet tracing.
 Toggle verbose mode.
 .El
 .Sh SEE ALSO
-.Xr tftp 1
+.Xr tftpd 8
 .Pp
 The following RFC's are supported:
 .Rs
@@ -256,6 +256,12 @@ The
 .Nm
 command appeared in
 .Bx 4.3 .
+.Pp
+Edwin Groothuis <edwin@FreeBSD.org> performed a major rewrite of the
+.Xr tftpd 8
+and
+.Nm
+code to support RFC2348.
 .Sh NOTES
 Because there is no user-login or validation within
 the