diff --git a/debian/changelog b/debian/changelog
index bbad746b..0f6f8fa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,6 +79,13 @@ llvm-toolchain-snapshot (1:13~++20210129063721+010b176cdefb-1~exp1) experimental
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 30 Jan 2021 17:31:15 +0100
 
+llvm-toolchain-12 (1:12.0.1-4) UNRELEASED; urgency=medium
+
+  * Make libunwind-dev depends on libunwind
+  * Don't build libunwind on armel & mipsel
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 08 Aug 2021 10:58:54 +0200
+
 llvm-toolchain-12 (1:12.0.1-3) unstable; urgency=medium
 
   * Build libunwind only on amd64 arm64 armhf i386
diff --git a/debian/control b/debian/control
index 76bcf4db..480336c6 100644
--- a/debian/control
+++ b/debian/control
@@ -738,6 +738,7 @@ Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 sparc sparc6
 Multi-Arch: same
 Depends:
  ${misc:Depends},
+ libunwind-12 (= ${binary:Version})
 Breaks: libunwind-dev
 Provides: libunwind-x.y-dev
 Conflicts: libunwind-x.y-dev
diff --git a/debian/rules b/debian/rules
index 0b25ede6..c8269b67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -194,7 +194,7 @@ endif
 
 # Enable libunwind (or not)
 LIBUNWIND_ENABLE=yes
-ifneq (,$(filter $(DEB_HOST_ARCH), s390x))
+ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel mipsel))
   LIBUNWIND_ENABLE=no
 else
   PROJECTS+=;libunwind