diff --git a/debian/changelog b/debian/changelog
index 47dd86c9..3fff3890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 llvm-toolchain-snapshot (1:14~++20210817085703+f5616a981c60-1~exp1) UNRELEASED; urgency=medium
 
+  [ Sylvestre Ledru ]
   * experimental New snapshot release
   * remove "scan-build-py-force-utf-8-opening.diff"
     merged upstream
 
+  [ John Paul Adrian Glaubitz ]
+  * Disable libunwind on m68k and x32
+
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 17 Aug 2021 21:01:03 +0200
 
 llvm-toolchain-snapshot (1:14~++20210715093511+afc760ef3527-1~exp2) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 57ca0141..6fda8884 100755
--- a/debian/rules
+++ b/debian/rules
@@ -198,7 +198,7 @@ endif
 
 # Enable libunwind (or not)
 LIBUNWIND_ENABLE=yes
-ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel mipsel hurd-i386 powerpc))
+ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mipsel hurd-i386 powerpc x32))
   LIBUNWIND_ENABLE=no
 else
   PROJECTS+=;libunwind