diff --git a/textproc/xmlindent/Makefile b/textproc/xmlindent/Makefile
index 87d53064242b..5da8b525577e 100644
--- a/textproc/xmlindent/Makefile
+++ b/textproc/xmlindent/Makefile
@@ -1,26 +1,29 @@
 PORTNAME=	xmlindent
-PORTVERSION=	0.2.17
-PORTREVISION=	2
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.2.18
 CATEGORIES=	textproc
-MASTER_SITES=	SF
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	XML stream reformatter
 WWW=		https://xmlindent.sourceforge.net
 
 LICENSE=	GPLv2
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	penberg
+
 SOURCES=	error.c indent.c buffer.c main.c
 
-PLIST_FILES=	bin/xmlindent share/man/man1/xmlindent.1.gz
+PLIST_FILES=	bin/xmlindent \
+		share/man/man1/xmlindent.1.gz
 
 do-build:
 	@cd ${WRKSRC}; flex xmlindent.yy
 	${CC} ${CFLAGS} ${SOURCES:C/(.*)/${WRKSRC}\/\1/} \
 		-o ${WRKSRC}/${PORTNAME} -lfl
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/textproc/xmlindent/distinfo b/textproc/xmlindent/distinfo
index b89aa759bd64..1ca198c33b43 100644
--- a/textproc/xmlindent/distinfo
+++ b/textproc/xmlindent/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xmlindent-0.2.17.tar.gz) = 3a0f6887b696087b8dad4901d3994954214dbbd78499eaf622b9a85060cf254c
-SIZE (xmlindent-0.2.17.tar.gz) = 18333
+TIMESTAMP = 1733992941
+SHA256 (penberg-xmlindent-v0.2.18_GH0.tar.gz) = 9f9de6f6d759646fbaa229e2a69479e3937ecb5a0908d8700c49b99faa91db97
+SIZE (penberg-xmlindent-v0.2.18_GH0.tar.gz) = 18894