diff --git a/net/fort/Makefile b/net/fort/Makefile
index dd163a3ca597..f005b965dd2f 100644
--- a/net/fort/Makefile
+++ b/net/fort/Makefile
@@ -1,41 +1,43 @@
 PORTNAME=	fort
 DISTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	toni@devboks.com
 COMMENT=	FORT Validator is an open source RPKI validator
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcurl.so:ftp/curl libjansson.so:devel/jansson \
 		libxml2.so:textproc/libxml2
 RUN_DEPENDS=	${LOCALBASE}/bin/rsync:net/rsync
 
-USES=		autoreconf pkgconfig ssl
-USE_GCC=	yes
+USES=		autoreconf compiler:c11 pkgconfig ssl
 USE_GITHUB=	yes
 USE_RC_SUBR=	fort
 
 GH_ACCOUNT=	NICMx
 GH_PROJECT=	FORT-validator
 
 GNU_CONFIGURE=	yes
 
 SUB_FILES=	pkg-message
 
 post-patch:
+	@${REINPLACE_CMD} -e "s|%%DISTVERSION%%|${DISTVERSION}|" \
+		${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e "s|/tmp/fort|${ETCDIR}|" \
 		${WRKSRC}/examples/config.json
 	@${REINPLACE_CMD} -e "s|/usr/local/ssl|/etc/ssl|" \
 		${WRKSRC}/examples/config.json
 	@${REINPLACE_CMD} -e "s|rsync\",|${LOCALBASE}/bin/rsync\",|" \
 		${WRKSRC}/examples/config.json
 	@${REINPLACE_CMD} -e "/\"daemon\": false,/d" \
 		${WRKSRC}/examples/config.json
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/repository ${STAGEDIR}${ETCDIR}/tal
 	${INSTALL_DATA} ${WRKSRC}/examples/config.json \
 		${STAGEDIR}${ETCDIR}/fort-config.json.sample
 
 .include <bsd.port.mk>
diff --git a/net/fort/files/patch-configure.ac b/net/fort/files/patch-configure.ac
new file mode 100644
index 000000000000..36c0f268e1f3
--- /dev/null
+++ b/net/fort/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2021-10-19 22:44:35 UTC
++++ configure.ac
+@@ -2,7 +2,7 @@
+ # Process this file with autoconf to produce a configure script.
+ 
+ AC_PREREQ([2.69])
+-AC_INIT([fort], [m4_esyscmd_s([git describe --dirty --always --tags])],
++AC_INIT([fort], [%%DISTVERSION%%],
+ 	[fort-validator@nic.mx])
+ AC_CONFIG_SRCDIR([src/main.c])
+ AM_INIT_AUTOMAKE([subdir-objects])