diff --git a/debian/changelog b/debian/changelog
index 8ea35c8e..80e0a0ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,9 +8,10 @@ llvm-toolchain-snapshot (1:3.4~svn191069-1) unstable; urgency=low
   * libprofile_rt and runtime has been removed upstream (r191835)
     Features are provided by compiler-rt
   * Update the build dependency from tcl8.5 to tcl (Closes: #725954)
-  * Install libclang.so in /usr/lib/*/libclang-3.3.so
+  * Install libclang.so in /usr/lib/*/libclang-3.4.so
   * Install libclang.so.1 in /usr/lib/*/libclang-3.3.so.1
-  * Also ship the python clang binding (python-clang-3.3)
+  * Also ship the python clang binding (python-clang-3.4)
+  * Enable polly if the dependencies are OK
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 20 Sep 2013 05:25:17 +0200
 
diff --git a/debian/rules b/debian/rules
index 559138ab..74f3c7b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,6 +58,14 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
 endif
 endif
 
+# Enable polly (or not)
+POLLY_ENABLE=no
+ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libisl-dev) ge 0.12.1; echo $$?),0)
+ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libcloog-isl-dev) ge 0.18.1; echo $$?),0)
+POLLY_ENABLE=YES
+endif
+endif
+
 ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS)))
 # enable the code coverage
 	CODECOVERAGE=yes
@@ -125,11 +133,13 @@ override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/lldb-$(LL
     ln -s ../clang .; \
 	readlink clang
 
-	# cd tools/ && \
-    # if test -h polly; then \
-    #     rm polly; \
-    # fi; \
-    # ln -s ../polly .
+	if test $(POLLY_ENABLE) = yes; then \
+	cd tools/ && \
+    if test -h polly; then \
+        rm polly; \
+    fi; \
+    ln -s ../polly .; \
+	fi
 
 	if test $(LLDB_ENABLE) = yes; then \
 	    cd tools/ && \