diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile
index 654c949f03f3..e86920633e91 100644
--- a/net-mgmt/flow-tools/Makefile
+++ b/net-mgmt/flow-tools/Makefile
@@ -1,65 +1,54 @@
 PORTNAME=	flow-tools
-PORTVERSION=	0.68.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+DISTVERSION=	0.68.6
+PORTREVISION=	6
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Suite of tools and library to work with netflow data
 WWW=		https://github.com/5u623l20/flow-tools/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf libtool:keepla python:patch shebangfix
+USES=		autoreconf libtool:keepla python:run shebangfix
 USE_GITHUB=	yes
+GH_ACCOUNT=	5u623l20
+GH_TAGNAME=	039acc4
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	flow_capture flow_fanout
 
-GH_ACCOUNT=	5u623l20
-GH_TAGNAME=	2ca53f5
-
 SHEBANG_FILES=	bin/flow-*
+
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 SUB_LIST=	FLOW_CAPTURE_PIDDIR="${FLOW_CAPTURE_PIDDIR}" \
 		FLOW_CAPTURE_SPOOL="${FLOW_CAPTURE_SPOOL}"
 
 USERS=		flowtools
 GROUPS=		flowtools
 
 VARDIR?=		/var
 FLOW_CAPTURE_SPOOL=	${VARDIR}/db/flows
 FLOW_CAPTURE_PIDDIR=	${VARDIR}/run/flow-capture
 
 OPTIONS_DEFINE=	MYSQL OPENSSL PGSQL
 
-PY2TO3_CMD=	${LOCALBASE}/bin/2to3-${PYTHON_VER}
-PY2TO3_ARGS=	--fix=all --no-diffs --nobackups --verbose --write
-
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql="${LOCALBASE}"
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ON=	--with-openssl="${OPENSSLBASE}"
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgresql
 PGSQL_CONFIGURE_OFF=	--with-postgresql=no
 
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if ${PYTHON_MAJOR_VER} >= 3
-	${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/bin/flow-*
-.endif
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/libft.so.0.0.0
 
 post-stage:
 .for f in asn.sym filter.cfg ip-prot.sym ip-type.sym map.cfg mask.cfg stat.cfg \
 	tag.cfg tag.sym tcp-port.sym xlate.cfg
 	@${MV} ${STAGEDIR}${ETCDIR}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/flow-tools/distinfo b/net-mgmt/flow-tools/distinfo
index 9dd57fca5bd4..b61580745171 100644
--- a/net-mgmt/flow-tools/distinfo
+++ b/net-mgmt/flow-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613085161
-SHA256 (5u623l20-flow-tools-v0.68.6-2ca53f5_GH0.tar.gz) = db9e92d234911e4ad32744614ea75454601bfe0e7ebced6cdc17c395c36e01fb
-SIZE (5u623l20-flow-tools-v0.68.6-2ca53f5_GH0.tar.gz) = 1092146
+TIMESTAMP = 1783440528
+SHA256 (5u623l20-flow-tools-v0.68.6-039acc4_GH0.tar.gz) = 8b9ef3b01bda63b1d3a00b168cb776b43ef54786d62f182961fd259ba00b9bf6
+SIZE (5u623l20-flow-tools-v0.68.6-039acc4_GH0.tar.gz) = 1092158