diff --git a/debian/changelog b/debian/changelog
index 627fac8a..6b081141 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,18 @@
 llvm-toolchain-8 (1:8.0.1~+rc1-1~exp2) experimental; urgency=medium
 
+<<<<<<<
   * Use ThinLTO for the build
     Option -DLLVM_ENABLE_LTO="Thin" added
   * WebAssembly is now build by default, remove it from the
     experimental list
+=======
+  * Build using thinlto on non stretch, xenial and trusty
+    (fails with some undef symbols)
+    Option -DLLVM_ENABLE_LTO="Thin" added
+  * WebAssembly is now build by default, remove it from the
+    experimental list
+  * check-polly was executed twice
+>>>>>>>
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 19 May 2019 13:31:37 +0200
 
diff --git a/debian/rules b/debian/rules
index b633bd49..c0c82528 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,8 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
 endif
 
 VENDOR=$(shell lsb_release -is)
+DISTRO=$(shell lsb_release -sc)
+
 DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}')
 
 DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -220,7 +222,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))
 endif
 
 # Use thinlto for the link phase
-CMAKE_EXTRA += -DLLVM_ENABLE_LTO="Thin"
+if test ! "$DISTRO" = "stretch" -a ! "$DISTRO" = "xenial"  -a ! "$DISTRO" = "trusty"; then
+# Don't enable for old distros
+	CMAKE_EXTRA += -DLLVM_ENABLE_LTO="Thin"
+endif
 
 DH_OPTIONS=
 OCAML_ENABLE= no
@@ -820,11 +825,6 @@ endif
 # Managed by debian build system
 	rm -f $(CURDIR)/$(TARGET_BUILD)/lib/python*/site-packages/lldb/_lldb.so
 
-# polly tests
-	if test "$(POLLY_ENABLE)" = yes; then \
-		cd $(TARGET_BUILD)/ && LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ $(MAKE) -C tools/polly/test/ check-polly || true; \
-	fi
-
 # The compression of the code coverage report is done in the
 # hook B21GetCoverageResults on the server
 	if test "$(CODECOVERAGE)" = "yes"; then \