diff --git a/debian/changelog b/debian/changelog
index 63a3e515..0b48dcbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ llvm-toolchain-3.9 (1:3.9-4) unstable; urgency=medium
 
   * d/p/bug-30342.diff:
     Backport upstream bug 30342 to fix an infinity loop in rust testsuite
+  * LLVMConfig.cmake was installed into wrong location
+    Install a symlink from lib/cmake/llvm to share/llvm/cmake
+    (Closes: #839234)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 31 Oct 2016 10:47:52 +0100
 
diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in
index f4dbfc6b..b3a2a2ae 100644
--- a/debian/llvm-X.Y-dev.links.in
+++ b/debian/llvm-X.Y-dev.links.in
@@ -15,4 +15,5 @@ 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
 
-usr/lib/llvm-@LLVM_VERSION@/lib/llvm/cmake usr/lib/llvm-@LLVM_VERSION@/cmake
+usr/lib/llvm-@LLVM_VERSION@/lib/cmake/llvm usr/lib/llvm-@LLVM_VERSION@/cmake
+usr/lib/llvm-@LLVM_VERSION@/lib/cmake/llvm usr/lib/llvm-@LLVM_VERSION@/share/llvm/cmake