diff --git a/common/shlibs b/common/shlibs
index 8e1953fd4c..a841c384de 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3851,7 +3851,7 @@ libtss2-tctildr.so.0 tpm2-tss-2.3.1_1
 libzfsbootenv.so.1 zfs-2.0.3_2
 libzfs.so.4 zfs-2.0.3_2
 libuutil.so.3 zfs-2.0.3_2
-libzpool.so.4 zfs-2.0.3_2
+libzpool.so.5 zfs-2.1.0_1
 libzfs_core.so.3 zfs-2.0.3_2
 libnvpair.so.3 zfs-2.0.3_2
 libgmio.so gmio-0.4.1_1
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index b25cb8d881..79cf6830f1 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.0.5
+version=2.1.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -15,13 +15,17 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://openzfs.github.io/openzfs-docs/"
 distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=3a17498d704ebf4c5d7231660f6fb44ae07a1545519f567452a4270851a86ec9
+checksum=60bddcb630284c771dcf5a1109ca9329d16523a3a40a374019955cfbf97bf34f
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"
 
 replaces="spl<=0.7.13_1" # Because SPL was merged into zfs in 0.8.0
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
 post_patch() {
 	# When collecting a "clean" tree for DKMS, don't leave patches in place
 	local _f