diff --git a/devel/libkiwix/Makefile b/devel/libkiwix/Makefile
index b842c0fc406f..466a94bd8d5a 100644
--- a/devel/libkiwix/Makefile
+++ b/devel/libkiwix/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	libkiwix
 DISTVERSION=	14.0.0
 CATEGORIES=	devel
+MASTER_SITES=	https://download.kiwix.org/release/libkiwix/
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
-COMMENT=	Common code base for all Kiwix ports
-WWW=		https://www.kiwix.org/
+COMMENT=	Software library to read and write ZIM files
+WWW=		https://github.com/kiwix/libkiwix
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	bash:shells/bash
+# 'googletest' dependency is only necessary for Meson's 'test' target, but it
+# must be present as soon as configure time.
+BUILD_DEPENDS=	bash:shells/bash \
+		${LOCALBASE}/include/kainjow/mustache.hpp:devel/mustache \
+		googletest>0:devel/googletest
+
 LIB_DEPENDS=	libzim.so:devel/libzim \
 		libpugixml.so:textproc/pugixml \
 		libaria2.so:www/aria2 \
 		libicui18n.so:devel/icu \
 		libicuuc.so:devel/icu \
 		libxapian.so:databases/xapian-core \
 		libctpp2.so:textproc/ctpp2 \
 		libcurl.so:ftp/curl \
 		libmicrohttpd.so:www/libmicrohttpd
 
-USES=		compiler:c++17-lang meson pkgconfig python shebangfix
-USE_GITHUB=	yes
-GH_ACCOUNT=	kiwix
-GH_TUPLE=	kiwix:${PORTNAME}:${PORTVERSION}:DEFAULT \
-		kainjow:Mustache:v4.1:mustache
+USES=		compiler:c++17-lang meson pkgconfig python shebangfix tar:xz
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	libkiwix13
 
 SHEBANG_FILES=	scripts/format_code.sh
 SHEBANG_REGEX=	./scripts/kiwix.*[^.].
 
-CPPFLAGS+=	-I${WRKSRC_mustache}
-CXXFLAGS+=	-I${WRKSRC_mustache}
-LDFLAGS+=	-lz
+CPPFLAGS+=	-I${LOCALBASE}/include/kainjow
+CXXFLAGS+=	-I${LOCALBASE}/include/kainjow
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//}
 
 .include <bsd.port.mk>
diff --git a/devel/libkiwix/distinfo b/devel/libkiwix/distinfo
index 38996a83e9f7..dd3e12eee001 100644
--- a/devel/libkiwix/distinfo
+++ b/devel/libkiwix/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1736502491
-SHA256 (kiwix-libkiwix-14.0.0_GH0.tar.gz) = dae329ebc08ff510daa50b42de71366bf063813e29bf1c09cc49335d90f32094
-SIZE (kiwix-libkiwix-14.0.0_GH0.tar.gz) = 1149884
-SHA256 (kainjow-Mustache-v4.1_GH0.tar.gz) = acd66359feb4318b421f9574cfc5a511133a77d916d0b13c7caa3783c0bfe167
-SIZE (kainjow-Mustache-v4.1_GH0.tar.gz) = 98905
+TIMESTAMP = 1736786938
+SHA256 (libkiwix-14.0.0.tar.xz) = fbdc64d37efd17f3f195725441b5239c8aaf01797af86415dc4f889f499210dc
+SIZE (libkiwix-14.0.0.tar.xz) = 1003564
diff --git a/devel/libkiwix/pkg-descr b/devel/libkiwix/pkg-descr
index bd84147decbf..7ead8d1e5228 100644
--- a/devel/libkiwix/pkg-descr
+++ b/devel/libkiwix/pkg-descr
@@ -1,5 +1,5 @@
-Kiwix is an offline reader for web content archived in ZIM format. It is
+Kiwix is an offline reader for web content archived in ZIM format.  It is
 particularly tailored towards Wikipedia and other wikis.
 
-The Kiwix library contains the code shared by Kiwix ports on all supported
-platforms.
+Libkiwix provides the Kiwix software suite core.  It contains the code shared by
+all Kiwix ports.