diff --git a/debian/changelog b/debian/changelog
index 248eefad..e0e53eb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,6 +109,13 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 28 Jan 2023 18:07:40 +0100
 
+llvm-toolchain-16 (1:16.0.6-14) UNRELEASED; urgency=medium
+
+  * On bionic & buster, for apt.llvm.org, pass -DLLVM_ENABLE_ZSTD=OFF
+    as libzstd is too old
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 08 Sep 2023 17:26:20 +0200
+
 llvm-toolchain-16 (1:16.0.6-13) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
diff --git a/debian/rules b/debian/rules
index 9b6e8def..e8dc5bf5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -423,6 +423,12 @@ ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))
 	STAGE_2_CMAKE_EXTRA += -DLLVM_USE_PERF=ON -DLLVM_ENABLE_LIBPFM=ON
 endif
 
+LLVM_ENABLE_ZSTD_DISABLE_DISTRO := bionic buster
+# Disable zstd on old distro, fails on lld
+ifeq (,$(filter-out $(LLVM_ENABLE_ZSTD_DISABLE_DISTRO), $(DISTRO)))
+       STAGE_ALL_CMAKE_EXTRA += -DLLVM_ENABLE_ZSTD=OFF
+endif
+
 LTO_ENABLE=no
 # Only enable it for archs supporting gold
 ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))