diff --git a/debian/changelog b/debian/changelog
index f20192cf..dcf116be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,17 +4,18 @@ llvm-toolchain-3.9 (1:3.9-5) UNRELEASED; urgency=medium
     to fix some issues in rust (Closes: #842956)
     Many thanks to Ximin Luo for the investigation
 
+  * libclang-common-3.9-dev: missing multilib binaries for the sanatizer
+    libraries (Closes: #841923)
+    Many thanks to Norbert Lange for the changes
+
   [ Pauli ]
-  * d/p/clang-default-to-i686-on-32bit-x86-targets.patch:
-    Set i386 default target CPU to be i686 (same as gcc)
-    (Closes: #812803)
   * d/p/clang-fix-cmpxchg8-detection-on-i386.patch:
     libcxx atomic tests for old i386 fail with wrong Atomic inline width.
     Needed for libc++
     (See https://llvm.org/bugs/show_bug.cgi?id=19355)
   * d/p lldb-addversion-suffix-to-llvm-server-exec.patch:
     Fix the lldb-server call in some cases
-  
+
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 04 Nov 2016 17:18:07 +0100
 
 llvm-toolchain-3.9 (1:3.9-4) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index b843f2fb..18219cbf 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
     lsb-release, patchutils, diffstat, xz-utils, python-dev,
     libedit-dev, swig, python-six, python-sphinx, ocaml-nox, binutils-dev,
     libjsoncpp-dev,
-    lcov, procps, help2man, dh-ocaml, zlib1g-dev
+    lcov, procps, help2man, dh-ocaml, zlib1g-dev,
+    g++-multilib
 Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev,
   libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
 Standards-Version: 3.9.8
diff --git a/debian/patches/series b/debian/patches/series
index 2043c73e..c1d132f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,7 +20,7 @@ silent-more-tests.diff
 disable-display-PASS-UNSUPPORTED-XFAIL.diff
 fix-llvm-config-obj-src-root.patch
 compiler-rt-path.diff
-0044-soname.diff 
+0044-soname.diff
 lldb-soname.diff
 lldb-libname.diff
 hurd-EIEIO-undef.diff
@@ -39,6 +39,5 @@ drop-wrong-hack-arm64.patch
 bug-30342.diff
 fix-scan-view-path.diff
 0011-SimplifyCFG-Hoisting-invalidates-metadata.patch
-clang-default-to-i686-on-32bit-x86-targets.patch
 clang-fix-cmpxchg8-detection-on-i386.patch
 lldb-addversion-suffix-to-llvm-server-exec.patch
diff --git a/debian/patches/silent-llvm-symbolizer.diff b/debian/patches/silent-llvm-symbolizer.diff
new file mode 100644
index 00000000..4834dae6
--- /dev/null
+++ b/debian/patches/silent-llvm-symbolizer.diff
@@ -0,0 +1,12 @@
+Index: llvm-toolchain-3.8-3.8.1/test/tools/llvm-symbolizer/print_context.c
+===================================================================
+--- llvm-toolchain-3.8-3.8.1.orig/test/tools/llvm-symbolizer/print_context.c
++++ llvm-toolchain-3.8-3.8.1/test/tools/llvm-symbolizer/print_context.c
+@@ -1,6 +1,7 @@
+ // REQUIRES: x86_64-linux
+ // RUN: %host_cc -O0 -g %s -o %t 2>&1
+ // RUN: %t 2>&1 | llvm-symbolizer -print-source-context-lines=5 -obj=%t | FileCheck %s --check-prefix=CHECK
++// XFAIL: *
+ 
+ #include <stdio.h>
+ 
diff --git a/debian/rules b/debian/rules
index 63a1adb1..60fc7edb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -400,7 +400,8 @@ override_dh_auto_install:
 
 
 override_dh_shlibdeps:
-	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ dh_shlibdeps
+# Ignore asan libraries. They would trigger dependencies to multiarch libraries
+	dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ -Xlibclang_rt.asan -Xlibclang_rt.asan
 
 override_dh_installman:
 	dh_installman