diff --git a/debian/changelog b/debian/changelog
index 41b544fc..d069ec14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 llvm-toolchain-4.0 (1:4.0-5) unstable; urgency=medium
 
+  * Really fix "use versioned symbols" for llvm
+    Thanks to Julien Cristau for the patch (Closes: #849098)
   * Prepare version 4.0.1
   * Tolerate if ocaml failed
   * Just like with snapshot, add libncurses in the list of build deps
@@ -7,6 +9,7 @@ llvm-toolchain-4.0 (1:4.0-5) unstable; urgency=medium
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 25 Apr 2017 13:32:25 +0200
 
+>>>>>>> .r2572
 llvm-toolchain-4.0 (1:4.0-4) unstable; urgency=medium
 
   * Limit the archs where the ocaml binding is built
diff --git a/debian/rules b/debian/rules
index 6f4aa394..cf8cdb30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -448,9 +448,10 @@ override_dh_auto_install:
 
 
 override_dh_makeshlibs:
-	dh_makeshlibs
 	dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) -V"libclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:4.0-3~)"
 	dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 1:4.0-3~)"
+	dh_makeshlibs -plibllvm-$(LLVM_VERSION) -V"libllvm-$(LLVM_VERSION) (>= 1:4.0-3~)"
+	dh_makeshlibs --remaining-packages
 
 override_dh_shlibdeps:
 # Ignore asan libraries. They would trigger dependencies to multiarch libraries