diff --git a/debian/changelog b/debian/changelog
index 3e8ce7bb7..e0adcbc5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 linux (4.2~rc8-1~exp2) UNRELEASED; urgency=medium
 
   * Remove all support for ia64 (Closes: #679545, #691576, #728706)
+  * [s390x] Compile with gcc-4.9 (Closes: #796845)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 25 Aug 2015 18:50:57 +0100
 
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index fb66f34e2..21cca5435 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -2,8 +2,6 @@
 flavours:
  s390x
 kernel-arch: s390
-# gcc 4.9 breaks access to virtual address 0
-compiler: gcc-4.8
 
 [build]
 image-file: arch/s390/boot/image