diff --git a/common/shlibs b/common/shlibs
index 44cd27132a6..880e3297137 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3132,7 +3132,7 @@ libKF5Kipi.so.32.0.0 libkipi5-17.04.3_1
 libhackrf.so.0 libhackrf-2017.02.1_1
 libtecla.so.1 libtecla-1.6.3_1
 libtecla_r.so.1 libtecla-1.6.3_1
-libzim.so.6 libzim-6.0.1_1
+libzim.so.8 libzim-8.2.1_1
 libkiwix.so.9 kiwix-lib-9.0.1_1
 libaria2.so.0 libaria2-1.35.0_3
 librpm.so.9 librpm-4.15.0_1
diff --git a/srcpkgs/libzim/patches/disable-check.patch b/srcpkgs/libzim/patches/disable-check.patch
new file mode 100644
index 00000000000..00a70a0dd48
--- /dev/null
+++ b/srcpkgs/libzim/patches/disable-check.patch
@@ -0,0 +1,13 @@
+# Reader test hangs indefinitely, reported upstream: https://github.com/openzim/libzim/issues/670
+diff --git a/test/meson.build b/test/meson.build
+index 20545b17b0..0263eb04e7 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -9,7 +9,6 @@ tests = [
+     'template',
+     'archive',
+     'iterator',
+-    'reader',
+     'find',
+     'compression',
+     'dirent_lookup',
diff --git a/srcpkgs/libzim/patches/execinfo.patch b/srcpkgs/libzim/patches/execinfo.patch
deleted file mode 100644
index f3a1234562e..00000000000
--- a/srcpkgs/libzim/patches/execinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/debug.h	2018-03-27 11:19:24.000000000 +0200
-+++ b/src/debug.h	2018-03-27 11:19:24.000000000 +0200
-@@ -24,7 +24,7 @@
- # define ASSERT(left, operator, right) (void(0))
- #else
- 
--#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__)
-+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) && defined(__GLIBC__)
- #include <execinfo.h>
- #endif
- 
-@@ -35,7 +35,7 @@
-       vara << "[" << a << "] " << op << " " << varb << "[" << b << "]" <<
-       std::endl;
- 
--#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__)
-+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) && defined(__GLIBC__)
-   void *callstack[64];
-   size_t size;
-   size = backtrace(callstack, 64);
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index cb6d1be1620..f916c99fc26 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,9 +1,12 @@
 # Template file for 'libzim'
 pkgname=libzim
-version=6.3.2
-revision=5
+version=8.2.1
+revision=1
+_testsuite_version=0.4
 build_style=meson
-hostmakedepends="pkg-config git"
+build_wrksrc="${pkgname}-${version}"
+configure_args="-Dtest_data_dir=${XBPS_BUILDDIR}/${pkgname}-${version}/zim-testing-suite-${_testsuite_version}/data"
+hostmakedepends="pkg-config"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
  $(vopt_if xapian "xapian-core-devel icu-devel")
  $(vopt_if zstd libzstd-devel) gtest-devel"
@@ -11,10 +14,13 @@ short_desc="Library to read and write ZIM files"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.openzim.org/wiki/OpenZIM"
-changelog="https://github.com/openzim/libzim/blob/${version}/ChangeLog"
-distfiles="https://github.com/openzim/libzim/archive/${version}.tar.gz"
-checksum=648fb5af65dd28a6b221b9294217939bf5abf929d706e7323ebb4196849a923c
-replaces="libzim-tools>=0"
+changelog="https://raw.githubusercontent.com/openzim/libzim/main/ChangeLog"
+distfiles="https://github.com/openzim/libzim/archive/refs/tags/${version}.tar.gz
+ https://github.com/openzim/zim-testing-suite/archive/refs/tags/v${_testsuite_version}.tar.gz"
+checksum="b8296644b04b02c04d2ff1458fed829df39b54e8fd1bcd23c10440e160819f13
+ 7a4f0c773e65be6fe49d3b2159bd9c0f051e8319932ebd3474db0f77f7ea9b27"
+make_check_pre="env SKIP_BIG_MEMORY_TEST=1"
+patch_args="-Np1 -d ${build_wrksrc}"
 
 build_options="xapian zlib zstd"
 build_options_default="xapian zlib zstd"