diff --git a/debian/changelog b/debian/changelog
index e5f9b334..529a293d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 llvm-toolchain-17 (1:17.0.6-9) UNRELEASED; urgency=medium
 
+  [ Zixing Liu ]
   * d/p/fix-unwind-detection-logic.patch: use an upstream patch to fix
     libunwind detection logic when compiler-rt is disabled.
 
- -- Zixing Liu <zixing.liu@canonical.com>  Tue, 05 Mar 2024 21:17:18 -0700
+  [ Matthias Klose ]
+  * Make libclang-common-18-dev architecture dependent, mark profile and xray
+    include files as optional on armel and armhf.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 06 Mar 2024 09:19:34 +0100
 
 llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
 
diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in
index 89cfed01..a2725566 100644
--- a/debian/libclang-common-X.Y-dev.install.in
+++ b/debian/libclang-common-X.Y-dev.install.in
@@ -1,7 +1,9 @@
+#!/usr/bin/dh-exec
+
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/*.h
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap
-usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/
-usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/
+[!armel !armhf] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/
+[!armel !armhf] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/ppc_wrappers/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/openmp_wrappers/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/cuda_wrappers/
diff --git a/debian/rules b/debian/rules
index 3ec6c28d..315243a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -619,6 +619,7 @@ stamps/preconfigure:
 	chmod +x \
 		debian/clang-tools-$(LLVM_VERSION).install \
 		debian/libclang-$(LLVM_VERSION)-dev.install \
+		debian/libclang-common-$(LLVM_VERSION)-dev.install \
 		debian/libclang-rt-$(LLVM_VERSION)-dev.install \
 		debian/libpolly-$(LLVM_VERSION)-dev.install \
 		debian/libomp-$(LLVM_VERSION)-dev.install \