diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in
index d8eecf40..8891a735 100644
--- a/debian/libclang-rt-X.Y-dev.install.in
+++ b/debian/libclang-rt-X.Y-dev.install.in
@@ -6,5 +6,5 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/*clang_rt*
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h
-# See cmake/Modules/AllSupportedArchDefs.cmake / ALL_ORC_SUPPORTED_ARCH
-[amd64 arm64 i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt*
+# See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / ALL_ORC_SUPPORTED_ARCH
+[amd64 armhf arm64 i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt*
diff --git a/debian/libomp-X.Y-dev.install.in b/debian/libomp-X.Y-dev.install.in
index 856a798f..081d2c52 100644
--- a/debian/libomp-X.Y-dev.install.in
+++ b/debian/libomp-X.Y-dev.install.in
@@ -19,4 +19,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/cmake/openmp/*.cmake
 [amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-device-info-@LLVM_VERSION@
 [amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@
 
-usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/
+[!armhf] usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/
diff --git a/debian/rules b/debian/rules
index 0ac28818..21228a72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1319,7 +1319,7 @@ endif
 	ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxxabi || true
 
 # MLIR
-ifeq (,$(filter $(DEB_HOST_ARCH), i386 x32))
+ifeq (,$(filter $(DEB_HOST_ARCH), armhf i386 x32))
 # Do not run MLIR test on i386 because of
 # https://github.com/llvm/llvm-project/issues/58357
 	ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-mlir || true