diff --git a/debian/changelog b/debian/changelog
index 80d1dcf4..721db4bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-3.8 (1:3.8-3) UNRELEASED; urgency=medium
+
+  * Improve the cmake detection (used for llvm.org/apt)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 13 Mar 2016 18:25:13 +0100
+
 llvm-toolchain-3.8 (1:3.8-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 4ad6542e..011221ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -205,15 +205,13 @@ override_dh_auto_configure: preconfigure
 	rm -fr tools/clang/tools/extra
 	cp -R -H clang-tools-extra tools/clang/tools/extra
 
-	# if cmake is installed in /tmp/cmake/ uses it
-	# Used to build llvm on old ubuntu (precise) on the llvm.org/apt/ ci
-	if test -d /tmp/cmake/bin/; then \
-		export PATH=/tmp/cmake/bin:$$PATH; \
-	fi
-
-	# TODO(axw) specify build type for CMake
-	# TODO(axw) pass compiler flags, etc.
-
+        # if cmake is installed in /tmp/cmake/ uses it
+        # Used to build llvm on old ubuntu (precise) on the llvm.org/apt/ ci
+        CMAKE_BIN=cmake; \
+        if test -f /tmp/cmake/bin/cmake; then \
+                CMAKE_BIN=/tmp/cmake/bin/cmake; \
+        fi; \
+        echo "Using cmake: $$CMAKE_BIN"; \
 	if test $(AUTOCONF_BUILD) = yes; then \
 		cd $(TARGET_BUILD); \
 		$(PRE_PROCESS_CONF) \
@@ -236,8 +234,8 @@ override_dh_auto_configure: preconfigure
 		$(CONFIGURE_EXTRA) \
 		CLANG_VENDOR=$(VENDOR) || { cat config.log tools/polly/config.log; exit 1; }; \
 	else \
-		cd $(TARGET_BUILD) && \
-		cmake ../ \
+	        cd $(TARGET_BUILD) && \
+	        $$CMAKE_BIN ../ \
 		-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION) \
 		-DCMAKE_VERBOSE_MAKEFILE=ON \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \