diff --git a/ftp/twoftpd/Makefile b/ftp/twoftpd/Makefile
index 6f938b9ada20..e5e5d50a3d4d 100644
--- a/ftp/twoftpd/Makefile
+++ b/ftp/twoftpd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	twoftpd
-PORTVERSION=	1.17
-PORTREVISION=	2
+PORTVERSION=	1.20
 CATEGORIES=	ftp
 MASTER_SITES=	http://untroubled.org/${PORTNAME}/
 
@@ -17,11 +16,16 @@ COMMENT=	A simple, secure, efficient FTP server
 BUILD_DEPENDS=	${LOCALBASE}/lib/libbg-unix.a:${PORTSDIR}/devel/bglibs \
 		${LOCALBASE}/lib/libcvm-client.a:${PORTSDIR}/security/cvm
 
+USE_REINPLACE=	yes
+
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS?=	-s
 
 DOCS=		NEWS README TODO
-MAN1=		twoftpd-auth.1 twoftpd-xfer.1
+MAN1=		twoftpd-auth.1 twoftpd-switch.1 twoftpd-xfer.1
+
+do-patch:
+	${REINPLACE_CMD} -e 's,timezone,tm.tm_gmtoff,' ${WRKSRC}/statmod.c
 
 do-configure:
 	${ECHO_CMD} "${PREFIX}/bin"	> ${WRKSRC}/conf-bin
diff --git a/ftp/twoftpd/distinfo b/ftp/twoftpd/distinfo
index 9008d4ec767f..739ecc9ac37f 100644
--- a/ftp/twoftpd/distinfo
+++ b/ftp/twoftpd/distinfo
@@ -1,2 +1,2 @@
-MD5 (twoftpd-1.17.tar.gz) = 818e12c71cee805d49fc732757358806
-SIZE (twoftpd-1.17.tar.gz) = 56755
+MD5 (twoftpd-1.20.tar.gz) = 6d51df0bf58e694fa92bc8e94228ed5b
+SIZE (twoftpd-1.20.tar.gz) = 57840
diff --git a/ftp/twoftpd/pkg-plist b/ftp/twoftpd/pkg-plist
index 7a6f7337990a..a3a7b3a5fead 100644
--- a/ftp/twoftpd/pkg-plist
+++ b/ftp/twoftpd/pkg-plist
@@ -4,6 +4,8 @@ bin/twoftpd-anon-conf
 bin/twoftpd-auth
 bin/twoftpd-bind-port
 bin/twoftpd-conf
+bin/twoftpd-drop
+bin/twoftpd-switch
 bin/twoftpd-xfer
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README