diff --git a/ftp/Makefile b/ftp/Makefile
index cbf45be174d1..984e2b57e3bc 100644
--- a/ftp/Makefile
+++ b/ftp/Makefile
@@ -1,97 +1,98 @@
     COMMENT = FTP client and server utilities
 
     SUBDIR += R-cran-RCurl
     SUBDIR += R-cran-curl
     SUBDIR += axel
     SUBDIR += bbftp-client
     SUBDIR += bbftp-server
     SUBDIR += bftpd
     SUBDIR += bsdftpd-ssl
     SUBDIR += cmdftp
     SUBDIR += curl
     SUBDIR += curlie
     SUBDIR += curlpp
     SUBDIR += dmachine
     SUBDIR += fastdfs
     SUBDIR += filezilla
     SUBDIR += fmirror
     SUBDIR += fpc-libcurl
+    SUBDIR += freebsd-ftpd
     SUBDIR += ftpcopy
     SUBDIR += ftpfind
     SUBDIR += ftplib
     SUBDIR += ftpmirror
     SUBDIR += ftpproxy
     SUBDIR += ftpsesame
     SUBDIR += ftpsync
     SUBDIR += gftp
     SUBDIR += gnustep-ftp
     SUBDIR += gstreamer1-plugins-curl
     SUBDIR += horde-gollem
     SUBDIR += hsftp
     SUBDIR += jftp
     SUBDIR += lftp
     SUBDIR += libfilezilla
     SUBDIR += linux-c7-curl
     SUBDIR += mirror
     SUBDIR += multiget
     SUBDIR += ncftp3
     SUBDIR += net2ftp
     SUBDIR += netdumpd
     SUBDIR += ocaml-ocurl
     SUBDIR += oftpd
     SUBDIR += omi
     SUBDIR += p5-File-Fetch
     SUBDIR += p5-Net-FTP-Common
     SUBDIR += p5-Net-FTP-Recursive
     SUBDIR += p5-Net-FTPSSL
     SUBDIR += p5-Net-FTPServer
     SUBDIR += p5-POE-Component-Client-FTP
     SUBDIR += p5-SOAP-Transport-FTP
     SUBDIR += paraget
     SUBDIR += pavuk
     SUBDIR += pear-Net_FTP
     SUBDIR += pftpd
     SUBDIR += php-fastdfs
     SUBDIR += php73-curl
     SUBDIR += php73-ftp
     SUBDIR += php74-curl
     SUBDIR += php74-ftp
     SUBDIR += php80-curl
     SUBDIR += php80-ftp
     SUBDIR += phpwebftp
     SUBDIR += proftpd
     SUBDIR += proftpd-mod_vroot
     SUBDIR += profxp
     SUBDIR += puf
     SUBDIR += pure-ftpd
     SUBDIR += py-aioftp
     SUBDIR += py-ftputil
     SUBDIR += py-pycurl
     SUBDIR += py-pyftpdlib
     SUBDIR += py-requests-ftp
     SUBDIR += py-sftp
     SUBDIR += py-tftpy
     SUBDIR += quftp
     SUBDIR += rexx-curl
     SUBDIR += rubygem-curb
     SUBDIR += rubygem-net-ftp
     SUBDIR += sftpgo
     SUBDIR += smbftpd
     SUBDIR += spegla
     SUBDIR += tftp-hpa
     SUBDIR += tnftp
     SUBDIR += tnftpd
     SUBDIR += twoftpd
     SUBDIR += uftp
     SUBDIR += urlgfe
     SUBDIR += vsftpd
     SUBDIR += vsftpd-ext
     SUBDIR += waiho
     SUBDIR += weex
     SUBDIR += wget
     SUBDIR += wmget
     SUBDIR += wput
     SUBDIR += wxdfast
     SUBDIR += yafc
 
 .include <bsd.port.subdir.mk>
diff --git a/ftp/freebsd-ftpd/Makefile b/ftp/freebsd-ftpd/Makefile
new file mode 100644
index 000000000000..c129ea875761
--- /dev/null
+++ b/ftp/freebsd-ftpd/Makefile
@@ -0,0 +1,40 @@
+# Created by: cy@FreeBSD.org
+
+PORTNAME=	freebsd-ftpd
+DISTVERSIONPREFIX=	v
+DISTVERSION=	20200704
+CATEGORIES=	ftp
+
+MAINTAINER=	cy@FreeBSD.org
+COMMENT=	FreeBSD ftpd
+
+LICENSE=	BSD3CLAUSE
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	cschuber
+
+USES=		uidfix
+
+MAKE_ARGS+=		BINOWN=${BINOWN} BINMODE=${BINMODE}
+MAKE_ENV+=		MAKESYSPATH=/usr/src/share/mk \
+			BINDIR=${PREFIX}/libexec \
+			MANDIR=${PREFIX}/man/man
+
+OPTIONS_DEFINE=		IPV6 LIBBLACKLIST
+OPTIONS_DEFAULT=	IPV6 LIBBLACKLIST
+.if !exists(/usr/include/blacklist.h)
+OPTIONS_EXCLUDE=	LIBBLACKLIST
+.endif
+
+LIBBLACKLIST_DESC=	libblacklist(3) support for rlogind(8) and rshd(8)
+LIBBLACKLIST_MAKE_ARGS=	USE_LIBBLACKLIST=yes
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300134
+MAKE_ENV+=	MK_WERROR=no
+.else
+MAKE_ENV+=	NO_WERROR=1
+.endif
+
+.include <bsd.port.mk>
diff --git a/ftp/freebsd-ftpd/distinfo b/ftp/freebsd-ftpd/distinfo
new file mode 100644
index 000000000000..206aaa765090
--- /dev/null
+++ b/ftp/freebsd-ftpd/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1624028878
+SHA256 (cschuber-freebsd-ftpd-v20200704_GH0.tar.gz) = b07938fcdea2191e967db16ad4d204711a33e06b2083a08622022fc55e42fbed
+SIZE (cschuber-freebsd-ftpd-v20200704_GH0.tar.gz) = 49136
diff --git a/ftp/freebsd-ftpd/pkg-descr b/ftp/freebsd-ftpd/pkg-descr
new file mode 100644
index 000000000000..c6e34039baea
--- /dev/null
+++ b/ftp/freebsd-ftpd/pkg-descr
@@ -0,0 +1,9 @@
+git filter-repo is a versatile tool for rewriting history, which
+includes capabilities I have not found anywhere else. It roughly falls
+into the same space of tool as git filter-branch but without the
+capitulation-inducing poor performance, with far more capabilities,
+and with a design that scales usability-wise beyond trivial rewriting
+cases. git filter-repo is now recommended by the git project instead of
+git filter-branch.
+
+WWW: https://github.com/newren/git-filter-repo
diff --git a/ftp/freebsd-ftpd/pkg-plist b/ftp/freebsd-ftpd/pkg-plist
new file mode 100644
index 000000000000..d20051b4d69b
--- /dev/null
+++ b/ftp/freebsd-ftpd/pkg-plist
@@ -0,0 +1,3 @@
+libexec/ftpd
+man/man5/ftpchroot.5.gz
+man/man8/ftpd.8.gz