diff --git a/devel/libzim/Makefile b/devel/libzim/Makefile
index 4d8096b30aee..dc3eb91d26b2 100644
--- a/devel/libzim/Makefile
+++ b/devel/libzim/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libzim
-PORTVERSION=	6.3.0
-PORTREVISION=	1
+DISTVERSION=	6.3.2
 CATEGORIES=	devel
+MASTER_SITES=	https://download.openzim.org/release/libzim/
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Reference implementation of the ZIM specification
@@ -9,16 +9,16 @@ COMMENT=	Reference implementation of the ZIM specification
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	googletest>0:devel/googletest
+
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libxapian.so:databases/xapian-core \
 		libzstd.so:archivers/zstd
 
-USES=		compiler:c++11-lang meson pkgconfig python:3.4+
+USES=		compiler:c++11-lang meson pkgconfig python:3.6+ tar:xz
 USE_LDCONFIG=	yes
-USE_GITHUB=	yes
-GH_ACCOUNT=	openzim
 
-BINARY_ALIAS=	python3=python${PYTHON_VER} python3-config=python${PYTHON_VER}-config
-PLIST_SUB=	PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//}
+BINARY_ALIAS=	python3=${PYTHON_CMD:T} python3-config=${PYTHON_CMD:T}-config
+PLIST_SUB=	DISTVERSION=${DISTVERSION} DISTMAJ=${DISTVERSION:C/\..*//}
 
 .include <bsd.port.mk>
diff --git a/devel/libzim/distinfo b/devel/libzim/distinfo
index e710cfc581ba..1cfa0eb53c48 100644
--- a/devel/libzim/distinfo
+++ b/devel/libzim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607220185
-SHA256 (openzim-libzim-6.3.0_GH0.tar.gz) = 984d2f3881c507c9f0212dc2bc1b808d25cdeef6a62043f9211fcb78a231a986
-SIZE (openzim-libzim-6.3.0_GH0.tar.gz) = 28664137
+TIMESTAMP = 1623283070
+SHA256 (libzim-6.3.2.tar.xz) = a7c8670068c3c5882bfe0429ecd21479d83e3e08eb6a7d72b7f187a6f53d553a
+SIZE (libzim-6.3.2.tar.xz) = 27636304
diff --git a/devel/libzim/pkg-plist b/devel/libzim/pkg-plist
index 1930e59f6809..5a87560026ff 100644
--- a/devel/libzim/pkg-plist
+++ b/devel/libzim/pkg-plist
@@ -12,6 +12,6 @@ include/zim/writer/creator.h
 include/zim/writer/url.h
 include/zim/zim.h
 lib/libzim.so
-lib/libzim.so.%%PORTMAJ%%
-lib/libzim.so.%%PORTVERSION%%
+lib/libzim.so.%%DISTMAJ%%
+lib/libzim.so.%%DISTVERSION%%
 libdata/pkgconfig/libzim.pc