diff --git a/debian/changelog b/debian/changelog
index f27a180d..67aa5851 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,31 @@ llvm-toolchain-snapshot (1:11~++20200123111717+04fd2041561-1~exp1) experimental;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 23 Jan 2020 14:52:30 +0100
 
+llvm-toolchain-10 (1:10.0.0~+rc2-3) UNRELEASED; urgency=medium
+
+  * Patch to convert old python3 cgi method into the new html one 
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 25 Feb 2020 14:57:08 +0100
+
+llvm-toolchain-10 (1:10.0.0~+rc2-2) unstable; urgency=medium
+
+  [ Sylvestre Ledru ]
+  * Pass -DCOMPILER_RT_USE_LIBCXX=NO to the build system
+    to bring fuzzer library back
+    https://bugs.llvm.org/show_bug.cgi?id=41956
+
+  [ Aurelien Jarno ]
+  * Also disable hwasan_symbolize on mipsel mips64el riscv64
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 16 Feb 2020 17:35:25 +0100
+
+llvm-toolchain-10 (1:10.0.0~+rc2-1) unstable; urgency=medium
+
+  * Upload to unstable to get ci.debian.net testing
+  * Also disable hwasan_symbolize on armel s390x powerpc ppc64
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 16 Feb 2020 14:50:53 +0100
+
 llvm-toolchain-10 (1:10.0.0~+rc2-1~exp1) experimental; urgency=medium
 
   * Second RC release
diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in
index 823e3733..b15f6577 100644
--- a/debian/clang-tools-X.Y.install.in
+++ b/debian/clang-tools-X.Y.install.in
@@ -33,7 +33,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace
 usr/lib/llvm-@LLVM_VERSION@/bin/clang-move
 usr/lib/llvm-@LLVM_VERSION@/bin/clang-offload-wrapper
 
-[!armhf !ppc64el !hurd-any] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize
+[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !sparc64 !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize
 
 clang/tools/scan-build-@LLVM_VERSION@      usr/share/clang/
 clang/tools/scan-build-py-@LLVM_VERSION@      usr/share/clang/
diff --git a/debian/libomp-X.Y-dev.install.in b/debian/libomp-X.Y-dev.install.in
index ccb04568..9255b828 100644
--- a/debian/libomp-X.Y-dev.install.in
+++ b/debian/libomp-X.Y-dev.install.in
@@ -1,6 +1,8 @@
+#!/usr/bin/dh-exec
+
 /usr/lib/llvm-@LLVM_VERSION@/include/openmp/omp*.h
 /usr/lib/llvm-@LLVM_VERSION@/lib/libgomp.so
 /usr/lib/llvm-@LLVM_VERSION@/lib/libiomp5.so
 /usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so
-/usr/lib/llvm-@LLVM_VERSION@/lib/libarcher_static.a
-/usr/lib/llvm-@LLVM_VERSION@/lib/libarcher.so
+[!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher_static.a
+[!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher.so
diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index 599695bb..dd4f0725 100755
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -9,9 +9,9 @@ VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p")
 DETAILED_VERSION=$(dpkg-parsechangelog |  sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1\2\3,p")
 DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
 
-LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb  libclang-common-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb  liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb  llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb"
+LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb  libclang-common-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb  liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb  llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb"
 echo "To install everything:"
-echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*'"
+echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*' 'python3-lldb-*'"
 echo "sudo dpkg -i $LIST"
 L=""
 for f in $LIST; do
diff --git a/debian/rules b/debian/rules
index 2069f305..8e224ad9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -296,7 +296,7 @@ preconfigure:
 	done
 
 	# Make install file executable for dh-exec
-	chmod +x debian/llvm-$(LLVM_VERSION)-dev.install debian/clang-tools-$(LLVM_VERSION).install
+	chmod +x debian/llvm-$(LLVM_VERSION)-dev.install debian/clang-tools-$(LLVM_VERSION).install debian/libomp-$(LLVM_VERSION)-dev.install
 
 	# DH doesn't support the [power ...] in install on Ubuntu trusty
 	# fails with cp: cannot stat 'debian/tmp/[!powerpc': No such file or directory
@@ -363,9 +363,10 @@ override_dh_auto_configure: preconfigure
 	-DLLVM_ENABLE_FFI=ON \
 	$(CMAKE_EXTRA) \
 	-DLIBCLANG_LIBRARY_VERSION=$(SONAME_EXT) \
-        -DCLANG_LINK_CLANG_DYLIB=ON \
+	-DCLANG_LINK_CLANG_DYLIB=ON \
 	-DENABLE_LINKER_BUILD_ID=ON \
 	-DPOLLY_BUNDLED_JSONCPP=OFF \
+	-DCOMPILER_RT_USE_LIBCXX=NO \
 	$(Z3_FLAG) \
 	-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="AVR" \
 	-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \