diff --git a/debian/changelog b/debian/changelog
index 5d20bf89..18872535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,10 @@ llvm-toolchain-snapshot (1:18~++20230725115106+b6847edfc235-1~exp1) experimental
 
 llvm-toolchain-17 (1:17.0.0~+rc4-1~exp4) experimental; urgency=medium
 
+  [ Gianfranco Costamagna ]
+  * Don't depend on spirv, the version 16 is too old to work
+
+  [ Sylvestre Ledru ]
   * Also ignore "-mbranch-protection=standard" (used on arm64)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 08 Sep 2023 13:49:38 +0200
@@ -143,12 +147,16 @@ 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
+llvm-toolchain-16 (1:16.0.6-14) unstable; urgency=medium
 
+  [ Sylvestre Ledru ]
   * 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
+  [ Gianfranco Costamagna ]
+  * Add i386 and mips64el to spirv architectures.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 10 Sep 2023 08:14:36 +0200
 
 llvm-toolchain-16 (1:16.0.6-13) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index d31cb193..5fc8ee16 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-    llvm-spirv-16 [ amd64 arm64 armel armhf ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
+#    llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,
diff --git a/debian/control.in b/debian/control.in
index d390d38a..43f5aae9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-    llvm-spirv-16 [ amd64 arm64 armel armhf ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
+#    llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,