diff --git a/net/fort/Makefile b/net/fort/Makefile
index ed7d500c8d38..9729473d8cf8 100644
--- a/net/fort/Makefile
+++ b/net/fort/Makefile
@@ -1,43 +1,42 @@
 PORTNAME=	fort
-DISTVERSION=	1.6.1
-PORTREVISION=	1
+DISTVERSION=	1.6.2
 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
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 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 1eae28584c55..0c852fdede0e 100644
--- a/net/fort/distinfo
+++ b/net/fort/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707198406
-SHA256 (NICMx-FORT-validator-1.6.1_GH0.tar.gz) = 0bed82f75bd6c4fffa4f5dc4118a706560f5eab27d85b9704380e570db8ff050
-SIZE (NICMx-FORT-validator-1.6.1_GH0.tar.gz) = 455892
+TIMESTAMP = 1719114666
+SHA256 (NICMx-FORT-validator-1.6.2_GH0.tar.gz) = aa6149256b0557e617cb0ff7f290464ee5fd930a02e7f9169f42ce157db025bf
+SIZE (NICMx-FORT-validator-1.6.2_GH0.tar.gz) = 397203
diff --git a/net/fort/files/patch-src_Makefile.am b/net/fort/files/patch-src_Makefile.am
index 0066f76f3587..b57ee7a99f05 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-12-14 01:43:09 UTC
+--- src/Makefile.am.orig	2024-06-23 03:52:55 UTC
 +++ src/Makefile.am
-@@ -118,7 +118,7 @@ fort_CFLAGS  = -Wall -Wpedantic
- # Feel free to temporarily remove this one if you're not using gcc 7.3.0.
+@@ -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_POSIX_C_SOURCE=200809 -D_XOPEN_SOURCE=700
+ 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
diff --git a/net/fort/files/patch-src_xml_relax__ng.c b/net/fort/files/patch-src_xml_relax__ng.c
new file mode 100644
index 000000000000..952d7b59a197
--- /dev/null
+++ b/net/fort/files/patch-src_xml_relax__ng.c
@@ -0,0 +1,19 @@
+--- src/xml/relax_ng.c.orig	2024-06-23 04:09:22 UTC
++++ src/xml/relax_ng.c
+@@ -35,8 +35,15 @@ relax_ng_log_warn(void *ctx, const char *msg, ...)
+ 	VLOG_MSG(warn)
+ }
+ 
++/* Signature changed at libxml2 commit 61034116d0a3c8b295c6137956adc3ae55720. */
++#if LIBXML_VERSION >= 21200
++#define XMLERROR_PARAMTYPE const xmlError *
++#else
++#define XMLERROR_PARAMTYPE xmlErrorPtr
++#endif
++
+ static void
+-relax_ng_log_str_err(void *userData, xmlErrorPtr error)
++relax_ng_log_str_err(void *userData, XMLERROR_PARAMTYPE error)
+ {
+ 	char *ptr;
+