diff --git a/debian/changelog b/debian/changelog
index ae72be93..e7a670d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 llvm-toolchain-3.9 (1:3.9~+rc1-1~exp2) experimental; urgency=medium
 
   * Disable the build of lldb on mips64el, ppc64 and s390x for real
+  * Add symlink from ./build to ../share and ../lib etc
+    Thanks to Ximin Luo for the patch (Closes: #834144)
 
  --
 
diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in
index c8cbce2f..f4dbfc6b 100644
--- a/debian/llvm-X.Y-dev.links.in
+++ b/debian/llvm-X.Y-dev.links.in
@@ -10,6 +10,8 @@ usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/build/inclu
 usr/include/llvm-@LLVM_VERSION@/llvm usr/lib/llvm-@LLVM_VERSION@/build/include/llvm
 
 usr/lib/llvm-@LLVM_VERSION@/include/ usr/lib/llvm-@LLVM_VERSION@/build/include
+usr/lib/llvm-@LLVM_VERSION@/lib/     usr/lib/llvm-@LLVM_VERSION@/build/lib
+usr/lib/llvm-@LLVM_VERSION@/share/   usr/lib/llvm-@LLVM_VERSION@/build/share
 usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Release
 usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Debug+Asserts