diff --git a/net/fort/Makefile b/net/fort/Makefile
index 49fdb5629233..33d8ba10a864 100644
--- a/net/fort/Makefile
+++ b/net/fort/Makefile
@@ -1,43 +1,41 @@
 PORTNAME=	fort
 DISTVERSION=	1.6.6
 CATEGORIES=	net
+MASTER_SITES=	https://github.com/NICMx/FORT-validator/releases/download/${DISTVERSION}/
 
 MAINTAINER=	toni@devboks.com
 COMMENT=	FORT Validator is an open source RPKI validator
 WWW=		https://fortproject.net/en/validator
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libjansson.so:devel/jansson
 RUN_DEPENDS=	${LOCALBASE}/bin/rsync:net/rsync
 
-USES=		autoreconf compiler:c11 gnome pkgconfig ssl
+USES=		gnome localbase:ldflags pkgconfig ssl
 USE_GNOME=	libxml2
-USE_GITHUB=	yes
 USE_RC_SUBR=	fort
 
-GH_ACCOUNT=	NICMx
-GH_PROJECT=	FORT-validator
-
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 SUB_FILES=	pkg-message
 
 post-patch:
+	@${REINPLACE_CMD} -e "s|-O2 -g||" \
+		${PATCH_WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e "s|/tmp/fort|${ETCDIR}|" \
-		${WRKSRC}/examples/config.json
+		${PATCH_WRKSRC}/examples/config.json
 	@${REINPLACE_CMD} -e "s|/usr/local/ssl|/etc/ssl|" \
-		${WRKSRC}/examples/config.json
+		${PATCH_WRKSRC}/examples/config.json
 	@${REINPLACE_CMD} -e "s|rsync\",|${LOCALBASE}/bin/rsync\",|" \
-		${WRKSRC}/examples/config.json
+		${PATCH_WRKSRC}/examples/config.json
 	@${REINPLACE_CMD} -e "/\"daemon\": false,/d" \
-		${WRKSRC}/examples/config.json
+		${PATCH_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/distinfo b/net/fort/distinfo
index 37eb7bbb319d..89e431cc69a8 100644
--- a/net/fort/distinfo
+++ b/net/fort/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743917833
-SHA256 (NICMx-FORT-validator-1.6.6_GH0.tar.gz) = 34e6fc4c35fc2f0e96d079c04302505199b0f4bcbb10139e0686655b309aa57f
-SIZE (NICMx-FORT-validator-1.6.6_GH0.tar.gz) = 402942
+TIMESTAMP = 1743972642
+SHA256 (fort-1.6.6.tar.gz) = b17ce9cf135a75ba1bc5ff25cabb8fca835add4d606abd8a5d7832ee41eb114f
+SIZE (fort-1.6.6.tar.gz) = 510520
diff --git a/net/fort/files/patch-src_Makefile.am b/net/fort/files/patch-src_Makefile.am
deleted file mode 100644
index b57ee7a99f05..000000000000
--- a/net/fort/files/patch-src_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.am.orig	2024-06-23 03:52:55 UTC
-+++ src/Makefile.am
-@@ -118,7 +118,7 @@ fort_SOURCES += $(ASN_MODULE_SRCS) $(ASN_MODULE_HDRS)
- fort_CFLAGS  = -Wall -Wpedantic
- #fort_CFLAGS += $(GCC_WARNS)
- fort_CFLAGS += -std=c99 -D_DEFAULT_SOURCE=1 -D_XOPEN_SOURCE=700 -D_BSD_SOURCE=1
--fort_CFLAGS += -O2 -g $(FORT_FLAGS) ${XML2_CFLAGS}
-+fort_CFLAGS += -O2 -g $(FORT_FLAGS) ${XML2_CFLAGS} ${JANSSON_CFLAGS}
- if BACKTRACE_ENABLED
- fort_CFLAGS += -DBACKTRACE_ENABLED
- endif