diff --git a/debian/changelog b/debian/changelog
index ff107d78..fb9ffc4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-3.8 (1:3.8-2) UNRELEASED; urgency=medium
+
+  * Disable polly on s390x.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 07 Mar 2016 10:56:05 +0100
+
 llvm-toolchain-3.8 (1:3.8-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 15bce969..0ca78449 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ endif
 endif
 
 # Enable polly (or not)
-ifeq (,$(filter $(DEB_HOST_ARCH), powerpc))
+ifeq (,$(filter $(DEB_HOST_ARCH), powerpc s390x))
   POLLY_ENABLE=yes
 endif