diff --git a/debian/changelog b/debian/changelog
index 84a191d6..27dd443a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,6 @@
 llvm-toolchain-17 (1:17.0.1-1~exp1) experimental; urgency=medium
 
   * New upstream release
-  * Make libclang-common-16-dev arch:any (Closes: #1041455)
-    It was arch:all because all the code isn't arch dependant
-    However, it causes issues for cross build.
-    So, back to any and libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})
-    instead of source
-    (thanks to Gianfranco Costamagna too)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Sep 2023 10:43:02 +0200
 
diff --git a/debian/control b/debian/control
index ac173527..ba78b466 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/17
 Package: clang-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-17-dev (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang-common-17-dev (= ${source:Version}),
  llvm-17-linker-tools (= ${binary:Version}),
  libclang1-17 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -166,7 +166,7 @@ Description: Clang library - Development package
  libclang1-17.
 
 Package: libclang-common-17-dev
-Architecture: any
+Architecture: all
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (>= ${source:Version}),
  libllvm17 (<< ${source:Version}.1~)
diff --git a/debian/control.in b/debian/control.in
index 9be543d2..43f5aae9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -43,7 +43,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/@BRANCH_
 Package: clang-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
  llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}),
  libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -166,7 +166,7 @@ Description: Clang library - Development package
  libclang1-@LLVM_VERSION@.
 
 Package: libclang-common-@LLVM_VERSION@-dev
-Architecture: any
+Architecture: all
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (>= ${source:Version}),
  libllvm@LLVM_VERSION@ (<< ${source:Version}.1~)