diff --git a/debian/changelog b/debian/changelog
index 09b1cb41..c7bac9b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-3.8 (1:3.8.1-18) unstable; urgency=medium
+
+  * Fix the broken liblldb-3.8-dev links (Closes: #856864)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 12 Mar 2017 09:49:18 +0100
+
 llvm-toolchain-3.8 (1:3.8.1-17) unstable; urgency=medium
 
   * Disable NEON generation on armhf (Closes: #841474, #842142)
diff --git a/debian/liblldb-X.Y.links.in b/debian/liblldb-X.Y.links.in
index a222fbc6..9ba83763 100644
--- a/debian/liblldb-X.Y.links.in
+++ b/debian/liblldb-X.Y.links.in
@@ -1,3 +1,4 @@
 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1       usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so
 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1
-
+usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so
+usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/liblldb-@LLVM_VERSION@.so.1
diff --git a/debian/rules b/debian/rules
index 1dd3be8a..82469f3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -553,6 +553,9 @@ ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf armel))
 	if test -d $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/; then \
 		cat $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/*; \
 	fi
+
+	cd $(TARGET_BUILD)/$(BUILD_DIR)/lib && \
+	rm -f liblldb-$(LLVM_VERSION).so
 endif
 
 # Managed by debian build system