diff --git a/debian/changelog b/debian/changelog
index d478b62f..31f7d890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,9 @@ llvm-toolchain-snapshot (1:3.7~svn231060-1~exp2) UNRELEASED; urgency=medium
 
   * Reflect upstream changes wrt vim package. Split the files into different
     directories
-  * Disable the patch force-gcc-header-obj.diff. Seems to cause bug 23556
+  * Disable the patch force-gcc-header-obj.diff. Seems to cause bug #23556
+  * Fix the CMake build. thanks to Paweł Bylica for the fix.
+    Fix upstream bug #23352
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 21 Apr 2015 09:41:41 +0200
 
diff --git a/debian/rules b/debian/rules
index 0f5bd959..357ef7e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -328,6 +328,9 @@ override_dh_auto_install:
 	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT \
 	$(CURDIR)/debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/build/autoconf/LICENSE.TXT
 
+# Change CMake module dir
+	sed -i 's|LLVM_CMAKE_DIR "/usr/lib/llvm-$(LLVM_VERSION)/share/llvm/cmake"|LLVM_CMAKE_DIR "/usr/share/llvm-$(LLVM_VERSION)/cmake"|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/llvm/cmake/LLVMConfig.cmake
+
 # Managed in lldb-X.Y.links.in
 	rm -f $(CURDIR)/$(TARGET_BUILD)/Release/lib/python*/site-packages/lldb/_lldb.so