diff --git a/debian/changelog b/debian/changelog
index 13ecb40c..a9f9bf65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,6 @@ llvm-toolchain-7 (1:7~+rc3-6) unstable; urgency=medium
 
   * Also manages clang-X as tool for scan-build
     see https://reviews.llvm.org/D52151
-
- --
-
 llvm-toolchain-7 (1:7~+rc3-5) unstable; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
@@ -299,6 +296,24 @@ llvm-toolchain-snapshot (1:7~svn322880-1) unstable; urgency=medium
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 18 Jan 2018 20:50:03 +0100
 
+llvm-toolchain-6.0 (1:6.0.1-10) UNRELEASED; urgency=medium
+
+  [ John Paul Adrian Glaubitz ]
+  * Add patch to fix missing include and library paths on x32
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Sat, 15 Sep 2018 09:35:13 +0200
+
+llvm-toolchain-6.0 (1:6.0.1-9) unstable; urgency=medium
+
+  [ John Paul Adrian Glaubitz ]
+  * Add patch to fix missing MultiArch include dir
+    on powerpcspe (Closes: #908791)
+
+  [ Gianfranco Costamagna ]
+  * Force polly cmake removal on arch:all because of --fail-missing
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Fri, 14 Sep 2018 09:24:02 +0200
+
 llvm-toolchain-6.0 (1:6.0.1-8) unstable; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
diff --git a/debian/rules b/debian/rules
index 61d409fe..6f9cdedd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -639,6 +639,8 @@ ifeq (${POLLY_ENABLE},yes)
 # only for arch:any builds
 ifneq (,$(filter libclang-common-$(LLVM_VERSION)-dev, $(shell dh_listpackages)))
 	dh_install -p libclang-common-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly
+# On old Debian & Ubuntu, removing the files is necessary
+	rm debian/tmp/usr/lib/llvm-$(VERSION)/lib/cmake/polly/*.cmake
 else
 	rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
 endif