diff --git a/net/fort/Makefile b/net/fort/Makefile
index e7bbacdda2ad..205c93f552e9 100644
--- a/net/fort/Makefile
+++ b/net/fort/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	fort
-DISTVERSION=	1.5.4
+DISTVERSION=	1.6.0
 CATEGORIES=	net
 
 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 \
 		libxml2.so:textproc/libxml2
 RUN_DEPENDS=	${LOCALBASE}/bin/rsync:net/rsync
 
 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|/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/distinfo b/net/fort/distinfo
index 4295ee9d021b..1ad7892e31c1 100644
--- a/net/fort/distinfo
+++ b/net/fort/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676960072
-SHA256 (NICMx-FORT-validator-1.5.4_GH0.tar.gz) = 2dc227fb0fe60a299bdf6666f61fd9c23e339474b424be6356287459e945b5d3
-SIZE (NICMx-FORT-validator-1.5.4_GH0.tar.gz) = 474175
+TIMESTAMP = 1702517933
+SHA256 (NICMx-FORT-validator-1.6.0_GH0.tar.gz) = b7f80d55365a7fcdee06f2c6c1156b8c3c75cd39f9eeb4d741c67d6d34035228
+SIZE (NICMx-FORT-validator-1.6.0_GH0.tar.gz) = 455085
diff --git a/net/fort/files/patch-src_Makefile.am b/net/fort/files/patch-src_Makefile.am
index 02fcc8db4644..0066f76f3587 100644
--- a/net/fort/files/patch-src_Makefile.am
+++ b/net/fort/files/patch-src_Makefile.am
@@ -1,11 +1,11 @@
---- src/Makefile.am.orig	2023-02-21 06:17:27 UTC
+--- src/Makefile.am.orig	2023-12-14 01:43:09 UTC
 +++ src/Makefile.am
-@@ -131,7 +131,7 @@ fort_SOURCES += $(ASN_MODULE_SRCS) $(ASN_MODULE_HDRS)
- fort_CFLAGS  = -Wall -Wno-cpp -Wpedantic
+@@ -118,7 +118,7 @@ fort_CFLAGS  = -Wall -Wpedantic
  # Feel free to temporarily remove this one if you're not using gcc 7.3.0.
  #fort_CFLAGS += $(GCC_WARNS)
--fort_CFLAGS += -std=gnu11 -O2 -g $(FORT_FLAGS) ${XML2_CFLAGS}
-+fort_CFLAGS += -std=gnu11 -O2 -g $(FORT_FLAGS) ${XML2_CFLAGS} ${JANSSON_CFLAGS}
+ fort_CFLAGS += -std=c99 -D_POSIX_C_SOURCE=200809 -D_XOPEN_SOURCE=700
+-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