diff --git a/textproc/libnxml/Makefile b/textproc/libnxml/Makefile
index d96a1fc47665..05238b090937 100644
--- a/textproc/libnxml/Makefile
+++ b/textproc/libnxml/Makefile
@@ -1,25 +1,27 @@
 PORTNAME=	libnxml
-PORTVERSION=	0.18.3
-PORTREVISION=	4
+PORTVERSION=	0.18.5
+PORTREVISION=	0
 CATEGORIES=	textproc devel
-MASTER_SITES=	https://www.autistici.org/bakunin/libnxml/
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	C library for writing XML 1.0/1.1 files or streams
 WWW=		https://github.com/bakulf/libnxml
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
-USES=		libtool pathfix
+USES=		autoreconf libtool pathfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	bakulf
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 INSTALL_TARGET=	install-strip
 
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
 .include <bsd.port.mk>
diff --git a/textproc/libnxml/distinfo b/textproc/libnxml/distinfo
index 0fc76dc9148f..713a5658598a 100644
--- a/textproc/libnxml/distinfo
+++ b/textproc/libnxml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libnxml-0.18.3.tar.gz) = 0f9460e3ba16b347001caf6843f0050f5482e36ebcb307f709259fd6575aa547
-SIZE (libnxml-0.18.3.tar.gz) = 361977
+TIMESTAMP = 1787515401
+SHA256 (bakulf-libnxml-0.18.5_GH0.tar.gz) = 263d6424db3cd5f17a9f6300594548e82449ed22af59e9e5534646fa0dabd6a7
+SIZE (bakulf-libnxml-0.18.5_GH0.tar.gz) = 37357
diff --git a/textproc/libnxml/pkg-plist b/textproc/libnxml/pkg-plist
index c088ce1c4b10..2dcee7f9e3ec 100644
--- a/textproc/libnxml/pkg-plist
+++ b/textproc/libnxml/pkg-plist
@@ -1,6 +1,6 @@
 include/nxml.h
 lib/libnxml.a
 lib/libnxml.so
 lib/libnxml.so.0
-lib/libnxml.so.0.18.3
+lib/libnxml.so.0.18.5
 libdata/pkgconfig/nxml.pc