diff --git a/ftp/tnftpd/Makefile b/ftp/tnftpd/Makefile
index 602bd58a5f58..dc002c6811a2 100644
--- a/ftp/tnftpd/Makefile
+++ b/ftp/tnftpd/Makefile
@@ -1,43 +1,51 @@
 PORTNAME=	tnftpd
-PORTVERSION=	20200704
+DISTVERSION=	20231001
 CATEGORIES=	ftp
-MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
+MASTER_SITES=	https://cdn.netbsd.org/pub/NetBSD/misc/tnftp/ \
+		https://ftp.uni-erlangen.de/netbsd/misc/tnftp/ \
+		https://ftp.jaist.ac.jp/pub/NetBSD/misc/tnftp/ \
+		https://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
 
 MAINTAINER=	cejkar@fit.vutbr.cz
 COMMENT=	Enhanced FTP server from NetBSD
+WWW=		https://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
+
+LICENSE=	BSD2CLAUSE BSD3CLAUSE
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf libtool
 GNU_CONFIGURE=	yes
 
 CFLAGS+=	-DSUPPORT_UTMPX -fcommon
 
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	libexec/tnftpd \
 		man/man5/ftpd.conf.5.gz \
 		man/man5/ftpusers.5.gz \
 		man/man8/tnftpd.8.gz
 PORTDOCS=	COPYING ChangeLog NEWS README THANKS
 PORTEXAMPLES=	ftpd.conf ftpusers
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/tnftpd ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.man ${STAGEDIR}${PREFIX}/man/man5/ftpd.conf.5
 	${INSTALL_MAN} ${WRKSRC}/src/ftpusers.man ${STAGEDIR}${PREFIX}/man/man5/ftpusers.5
 	${INSTALL_MAN} ${WRKSRC}/src/tnftpd.man ${STAGEDIR}${PREFIX}/man/man8/tnftpd.8
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/ftp/tnftpd/distinfo b/ftp/tnftpd/distinfo
index dfad197f3094..b09601a4e7dd 100644
--- a/ftp/tnftpd/distinfo
+++ b/ftp/tnftpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1597924555
-SHA256 (tnftpd-20200704.tar.gz) = 92de915e1b4b7e4bd403daac5d89ce67fa73e49e8dda18e230fa86ee98e26ab7
-SIZE (tnftpd-20200704.tar.gz) = 529105
+TIMESTAMP = 1700838023
+SHA256 (tnftpd-20231001.tar.gz) = 24a51bd2e5818ddb8c2479df9c8175a78dd8a5ef49ee3ab09f5f39c35069826e
+SIZE (tnftpd-20231001.tar.gz) = 536802
diff --git a/ftp/tnftpd/files/patch-ls_ls.c b/ftp/tnftpd/files/patch-ls_ls.c
new file mode 100644
index 000000000000..5ee7a98adff8
--- /dev/null
+++ b/ftp/tnftpd/files/patch-ls_ls.c
@@ -0,0 +1,35 @@
+Looking at FreeBSD's manual page, it appears that FreeBSD 5.2 changed
+the signature of the comparison function:
+
+        FTS * fts_open(char * const *path_argv, int options,
+                int (*compar)(const FTSENT * const *, const FTSENT * const *));
+
+--- ls/ls.c.orig	2009-03-01 22:58:20 UTC
++++ ls/ls.c
+@@ -73,7 +73,14 @@ static void	 display(FTSENT *, FTSENT *);
+ #include "extern.h"
+ 
+ static void	 display(FTSENT *, FTSENT *);
++
++/* workaround FreeBSD <fts.h> changing fts_open()'s compar signature */
++#if defined(__FreeBSD__) && defined(USE_FTS_H)
++static int	 mastercmp(const FTSENT * const *, const FTSENT * const *);
++#else
+ static int	 mastercmp(const FTSENT **, const FTSENT **);
++#endif
++
+ static void	 traverse(int, char **, int);
+ 
+ static void (*printfcn)(DISPLAY *);
+@@ -595,7 +602,11 @@ static int
+  * All other levels use the sort function.  Error entries remain unsorted.
+  */
+ static int
++#if defined(__FreeBSD__) && defined(USE_FTS_H)
++mastercmp(const FTSENT * const *a, const FTSENT * const *b)
++#else
+ mastercmp(const FTSENT **a, const FTSENT **b)
++#endif
+ {
+ 	int a_info, b_info;
+