diff --git a/textproc/xml-format/Makefile b/textproc/xml-format/Makefile
index c90ee490e41e..4f2474196619 100644
--- a/textproc/xml-format/Makefile
+++ b/textproc/xml-format/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	xml-format
 DISTVERSION=	0.2.0-3
 DISTVERSIONSUFFIX=	-g4448d89
+PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	XML beautifier
 WWW=		https://github.com/outpaddling/xml-format
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS+=	libxtend.so:devel/libxtend
 
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	outpaddling
 
 MAKE_ENV+=	DATADIR=${DATADIR} MANPREFIX=${PREFIX}/share
 
 .include <bsd.port.mk>
diff --git a/textproc/xml-format/files/patch-tag-list.c b/textproc/xml-format/files/patch-tag-list.c
new file mode 100644
index 000000000000..78e41b455d77
--- /dev/null
+++ b/textproc/xml-format/files/patch-tag-list.c
@@ -0,0 +1,16 @@
+--- tag-list.c.orig	2025-02-05 15:23:28 UTC
++++ tag-list.c
+@@ -1,3 +1,4 @@
++#include <errno.h>
+ #include <stdio.h>
+ #include <limits.h>
+ #include <string.h>
+@@ -80,8 +81,6 @@ void    tag_list_error_check(int list_size, const char
+ void    tag_list_error_check(int list_size, const char *path)
+ 
+ {
+-    extern int  errno;
+-    
+     if ( list_size == -1 )
+     {
+ 	fprintf(stderr, "Unable to read %s: %s\n", path, strerror(errno));
diff --git a/textproc/xml-format/files/patch-xml-format.c b/textproc/xml-format/files/patch-xml-format.c
new file mode 100644
index 000000000000..807eb921fedc
--- /dev/null
+++ b/textproc/xml-format/files/patch-xml-format.c
@@ -0,0 +1,18 @@
+--- xml-format.c.orig	2025-02-05 15:23:48 UTC
++++ xml-format.c
+@@ -13,6 +13,7 @@
+  *  2013-02-09  Jason Bacon Begin
+  ***************************************************************************/
+ 
++#include <errno.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
+@@ -69,7 +70,6 @@ int xml_format(const char *filename)
+ 	    buff[COPY_BUFF_SIZE+1],
+ 	    *subdir;
+     size_t  bytes;
+-    extern int  errno;
+     tag_list_t  tags;
+     
+     if ( ( subdir = strrchr(filename, '.')) == NULL )