diff -u gcc-4.6-4.6.4/debian/changelog gcc-4.6-4.6.4/debian/changelog
--- gcc-4.6-4.6.4/debian/changelog
+++ gcc-4.6-4.6.4/debian/changelog
@@ -1,3 +1,9 @@
+gcc-4.6 (4.6.4-6ubuntu6) xenial; urgency=medium
+
+  * Build for s390x.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 14 Dec 2015 01:49:30 +0100
+
 gcc-4.6 (4.6.4-6ubuntu5) xenial; urgency=medium
 
   * PPA upload.
diff -u gcc-4.6-4.6.4/debian/control gcc-4.6-4.6.4/debian/control
--- gcc-4.6-4.6.4/debian/control
+++ gcc-4.6-4.6.4/debian/control
@@ -13,7 +13,7 @@
   binutils (>= 2.21.1) | binutils-multiarch (>= 2.21.1), binutils-hppa64 (>= 2.21.1) [hppa],
   gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales, sharutils,
   procps,     
-  libcloog-ppl-dev (>= 0.16), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), libelfg0-dev (>= 0.8.12), dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen,
+  libcloog-pplv4-dev (>= 0.16), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmpv4-dev (>= 2:5.0.1~), libelfg0-dev (>= 0.8.12), dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen,
   realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt
 Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), gsfonts-x11, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns, 
 Homepage: http://gcc.gnu.org/
@@ -59,7 +59,7 @@
 Architecture: any
 Section: devel
 Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), gcc-4.6 (= ${gcc:Version}), libgmp-dev (>= 2:5.0.1~), ${shlibs:Depends}, ${misc:Depends}
+Depends: gcc-4.6-base (= ${gcc:Version}), gcc-4.6 (= ${gcc:Version}), libgmpv4-dev (>= 2:5.0.1~), ${shlibs:Depends}, ${misc:Depends}
 Description: Files for GNU GCC plugin development.
  This package contains (header) files for GNU GCC plugin development. It
  is only used for the development of GCC plugins, but not needed to run
diff -u gcc-4.6-4.6.4/debian/rules.conf gcc-4.6-4.6.4/debian/rules.conf
--- gcc-4.6-4.6.4/debian/rules.conf
+++ gcc-4.6-4.6.4/debian/rules.conf
@@ -289,7 +289,7 @@
   GMP_BUILD_DEP = libgmp3-dev,
   MPFR_BUILD_DEP = libmpfr-dev,
 else
-  GMP_BUILD_DEP = libgmp-dev (>= 2:5.0.1~),
+  GMP_BUILD_DEP = libgmpv4-dev (>= 2:5.0.1~),
   MPFR_BUILD_DEP = libmpfr-dev (>= 3.0.0-9~),
 endif
 
@@ -302,8 +302,8 @@
   CLOOG_BUILD_DEP = libcloog-ppl-dev (>= 0.16),
   CLOOG_RUNTIME_DEP = libcloog-ppl1 | libcloog-ppl0 (>= 0.15.9-2~), libppl-c4, libppl12 | libppl9
 else
-  PPL_BUILD_DEP = libppl-dev (>= 1:1.1)
-  CLOOG_BUILD_DEP = libcloog-ppl-dev (>= 0.16),
+  PPL_BUILD_DEP = libpplv4-dev (>= 1:1.1)
+  CLOOG_BUILD_DEP = libcloog-pplv4-dev (>= 0.16),
   CLOOG_RUNTIME_DEP = libcloog-ppl1, libppl-c4, libppl13
 endif
 
diff -u gcc-4.6-4.6.4/debian/rules.parameters gcc-4.6-4.6.4/debian/rules.parameters
--- gcc-4.6-4.6.4/debian/rules.parameters
+++ gcc-4.6-4.6.4/debian/rules.parameters
@@ -2,15 +2,15 @@
 GCC_VERSION	:= 4.6.4
 NEXT_GCC_VERSION	:= 4.6.5
 BASE_VERSION	:= 4.6
-SOURCE_VERSION	:= 4.6.4-6ubuntu4
-DEB_VERSION	:= 4.6.4-6ubuntu4
-DEB_EVERSION	:= 1:4.6.4-6ubuntu4
+SOURCE_VERSION	:= 4.6.4-6ubuntu6
+DEB_VERSION	:= 4.6.4-6ubuntu6
+DEB_EVERSION	:= 1:4.6.4-6ubuntu6
 GDC_BASE_VERSION  := 
 DEB_GDC_VERSION	:= 
 DEB_SOVERSION	:= 4.6
 DEB_SOEVERSION	:= 1:4.6
 DEB_LIBGCC_SOVERSION	:= 1:4.6
-DEB_LIBGCC_VERSION	:= 1:4.6.4-6ubuntu4
+DEB_LIBGCC_VERSION	:= 1:4.6.4-6ubuntu6
 DEB_STDCXX_SOVERSION	:= 4.6
 DEB_GCJ_SOVERSION	:= 4.6
 PKG_GCJ_EXT	:= 12
diff -u gcc-4.6-4.6.4/debian/rules.patch gcc-4.6-4.6.4/debian/rules.patch
--- gcc-4.6-4.6.4/debian/rules.patch
+++ gcc-4.6-4.6.4/debian/rules.patch
@@ -77,7 +77,6 @@
 	pr49756 \
 	pr49940 \
 	pr49944 \
-	gcc-cloog-dl \
 	libffi-kfreebsd \
 	libffi-m68k \
 	gcc-base-version \