diff --git a/debian/changelog b/debian/changelog
index 696e868f..d68f0c64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,14 @@ llvm-toolchain-snapshot (1:18~++20230725115106+b6847edfc235-1~exp1) experimental
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 25 Jul 2023 23:52:42 +0200
 
+llvm-toolchain-17 (1:17.0.0~+rc4-1~exp5) experimental; urgency=medium
+
+  * debian/patches/D158066.patch:
+    - cherry-pick change from 1:16.0.6-11
+  * Make sure at least spirv 17 is used, FTBFS with older version
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 12 Sep 2023 08:51:38 +0200
+
 llvm-toolchain-17 (1:17.0.0~+rc4-1~exp4) experimental; urgency=medium
 
   [ Gianfranco Costamagna ]
@@ -147,6 +155,18 @@ 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-16) UNRELEASED; urgency=medium
+
+  * Make libclang-common-16-dev arch:any (Closes: #1041455)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 16 Sep 2023 10:39:22 +0200
+
+llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
+
+  * Second attempt to refresh D158066.patch (Closes: #1049362)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 11 Sep 2023 15:40:42 +0200
+
 llvm-toolchain-16 (1:16.0.6-14) unstable; urgency=medium
 
   [ Sylvestre Ledru ]
diff --git a/debian/control b/debian/control
index 5fc8ee16..b14a766a 100644
--- a/debian/control
+++ b/debian/control
@@ -166,7 +166,7 @@ Description: Clang library - Development package
  libclang1-18.
 
 Package: libclang-common-18-dev
-Architecture: all
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (>= ${source:Version}),
  libllvm18 (<< ${source:Version}.1~)
diff --git a/debian/control.in b/debian/control.in
index 43f5aae9..c070c942 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -166,7 +166,7 @@ Description: Clang library - Development package
  libclang1-@LLVM_VERSION@.
 
 Package: libclang-common-@LLVM_VERSION@-dev
-Architecture: all
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (>= ${source:Version}),
  libllvm@LLVM_VERSION@ (<< ${source:Version}.1~)