diff --git a/debian/changelog b/debian/changelog
index df6bc912..2c3c7a1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ llvm-toolchain-snapshot (1:3.9~svn274438-1) unstable; urgency=medium
     issue on i386
   * Ignore the lintian override about embedded-library for json.
     Doesn't link otherwise
+  * Fix the soname of libclang and libLLVM. Might cause some breakage with
+    existing app but no choice...
 
   [ Pablo Oliveira ]
   * Add python-six as a dependency of python-lldb (Closes: #825371)
@@ -53,7 +55,7 @@ llvm-toolchain-snapshot (1:3.9~svn274438-1) unstable; urgency=medium
   [ YunQiang Su ]
   * Enable FPXX by default on mips/mipsel (Closes: #826749)
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 10 Jun 2016 10:22:26 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 02 Jul 2016 20:46:05 +0200
 
 llvm-toolchain-snapshot (1:3.9~svn260851-1) unstable; urgency=medium
 
diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff
index 92d944a4..31f7a0f5 100644
--- a/debian/patches/0044-soname.diff
+++ b/debian/patches/0044-soname.diff
@@ -1,17 +1,8 @@
---- a/tools/llvm-shlib/Makefile
-+++ b/tools/llvm-shlib/Makefile
-@@ -67,7 +67,7 @@
- 
- ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU))
-     # Add soname to the library.
--    LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) -Wl,-Bsymbolic-functions
-+    LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).1 -Wl,-Bsymbolic-functions
- endif
- 
- ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))
---- a/tools/llvm-shlib/CMakeLists.txt
-+++ b/tools/llvm-shlib/CMakeLists.txt
-@@ -39,6 +39,7 @@
+Index: llvm-toolchain-snapshot_3.9~svn274438/tools/llvm-shlib/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_3.9~svn274438.orig/tools/llvm-shlib/CMakeLists.txt
++++ llvm-toolchain-snapshot_3.9~svn274438/tools/llvm-shlib/CMakeLists.txt
+@@ -37,6 +37,7 @@ if(LLVM_DYLIB_EXPORTED_SYMBOL_FILE)
  endif()
  
  add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
@@ -19,9 +10,11 @@
  
  list(REMOVE_DUPLICATES LIB_NAMES)
  if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for elf"
---- a/clang/tools/libclang/CMakeLists.txt
-+++ b/clang/tools/libclang/CMakeLists.txt
-@@ -82,7 +82,7 @@
+Index: llvm-toolchain-snapshot_3.9~svn274438/clang/tools/libclang/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_3.9~svn274438.orig/clang/tools/libclang/CMakeLists.txt
++++ llvm-toolchain-snapshot_3.9~svn274438/clang/tools/libclang/CMakeLists.txt
+@@ -83,7 +83,7 @@ else()
    set(output_name "clang")
  endif()
  
diff --git a/debian/patches/series b/debian/patches/series
index 8df0d7ef..fa7328d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,6 +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 
 lldb-soname.diff
 lldb-libname.diff
 hurd-EIEIO-undef.diff
diff --git a/debian/rules b/debian/rules
index 5d4492d9..d4e4083c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -273,10 +273,8 @@ override_dh_auto_install:
 	# Only run on executable, not script
 	chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1`
 
-	cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \
-	mv libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so.$(SONAME_EXT) && \
-	ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT); \
-	ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so
+	cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \
+	ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT)
 
 #	cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \
 #    mv liblldb.so.$(LLVM_VERSION_FULL) liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) && \
@@ -303,9 +301,6 @@ override_dh_auto_install:
 # idem for the lldb python binding
 	mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python2.7/site-packages/lldb/
 
-	mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT)
-	cd $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ && ln -s libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) libLLVM-$(LLVM_VERSION).so
-
 # Remove things that CMake  install but which aren't packaged yet,
 # or are packaged from the source or build tree.
 	mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-$(LLVM_VERSION) \