diff --git a/www/kiwix-tools/Makefile b/www/kiwix-tools/Makefile
index 3becb04a3e5e..5a8bad550b9f 100644
--- a/www/kiwix-tools/Makefile
+++ b/www/kiwix-tools/Makefile
@@ -2,10 +2,11 @@ PORTNAME=	kiwix-tools
 DISTVERSION=	3.7.0
 PORTREVISION=	1
 CATEGORIES=	www
+MASTER_SITES=	https://download.kiwix.org/release/kiwix-tools/
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
-COMMENT=	Command-line Kiwix tools
-WWW=		https://www.kiwix.org/
+COMMENT=	Command-line Kiwix tools (serve, manage, search)
+WWW=		https://github.com/kiwix/kiwix-tools
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -13,10 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libkiwix.so.13:devel/libkiwix13 \
 		libzim.so:devel/libzim
 
-USES=		compiler:c++17-lang meson pkgconfig
-USE_GITHUB=	yes
-GH_ACCOUNT=	kiwix
-USE_RC_SUBR=	kiwix_serve
+USES=		compiler:c++17-lang meson pkgconfig tar:xz
 
 CXXFLAGS_gcc=	-Wno-error=maybe-uninitialized
 CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
diff --git a/www/kiwix-tools/distinfo b/www/kiwix-tools/distinfo
index 6c8edab5c109..fdd3a8cca374 100644
--- a/www/kiwix-tools/distinfo
+++ b/www/kiwix-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1716231298
-SHA256 (kiwix-kiwix-tools-3.7.0_GH0.tar.gz) = 7367400dab80fcf0702657b2d5324ec29f344581318659c106f5b7fca30fa0db
-SIZE (kiwix-kiwix-tools-3.7.0_GH0.tar.gz) = 539897
+TIMESTAMP = 1736784927
+SHA256 (kiwix-tools-3.7.0.tar.xz) = 7a764e6cb8f9b1f75e92a9c0d093d02c8c038d66019c4e49542cc261dfff540c
+SIZE (kiwix-tools-3.7.0.tar.xz) = 529908
diff --git a/www/kiwix-tools/pkg-descr b/www/kiwix-tools/pkg-descr
index 017828a2abc5..8d2c8e06338e 100644
--- a/www/kiwix-tools/pkg-descr
+++ b/www/kiwix-tools/pkg-descr
@@ -1,5 +1,7 @@
-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.
 
-This package contains command-line Kiwix tools: a local HTTP server to serve
-content, and a set of tools to manage ZIM files.
+The Kiwix tools are a collection of Kiwix-related command line tools:
+- kiwix-manage: Manage XML based library of ZIM files.
+- kiwix-search: Full text search in ZIM files.
+- kiwix-serve: HTTP daemon serving ZIM files.