diff --git a/gmp-4.0.1-s390.patch b/gmp-4.0.1-s390.patch
deleted file mode 100644
index a446cc3..0000000
--- a/gmp-4.0.1-s390.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up gmp-5.0.4/mpn/s390x/gmp-mparam.h.s390 gmp-5.0.4/mpn/s390x/gmp-mparam.h
---- gmp-5.0.4/mpn/s390-64/gmp-mparam.h.s390	2012-04-18 12:44:04.482509106 +0200
-+++ gmp-5.0.4/mpn/s390-64/gmp-mparam.h	2012-04-18 12:44:04.482509106 +0200
-@@ -0,0 +1,26 @@
-+/* gmp-mparam.h -- Compiler/machine parameter header file.
-+
-+Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-+2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-+
-+This file is part of the GNU MP Library.
-+
-+The GNU MP Library is free software; you can redistribute it and/or modify
-+it under the terms of the GNU Lesser General Public License as published by
-+the Free Software Foundation; either version 3 of the License, or (at your
-+option) any later version.
-+
-+The GNU MP Library is distributed in the hope that it will be useful, but
-+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-+License for more details.
-+
-+You should have received a copy of the GNU Lesser General Public License
-+along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
-+
-+#define BITS_PER_MP_LIMB 64
-+#define BYTES_PER_MP_LIMB 8
-+#define BITS_PER_LONGINT 64
-+#define BITS_PER_INT 32
-+#define BITS_PER_SHORTINT 16
-+#define BITS_PER_CHAR 8
diff --git a/gmp.spec b/gmp.spec
index 7297694..43740c3 100644
--- a/gmp.spec
+++ b/gmp.spec
@@ -6,14 +6,13 @@
 Summary: A GNU arbitrary precision library
 Name: gmp
 Version: 6.0.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 URL: http://gmplib.org/
 Source0: ftp://ftp.gmplib.org/pub/gmp-%{version}/gmp-%{version}a.tar.bz2
 # or ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.xz
 Source2: gmp.h
 Source3: gmp-mparam.h
-Patch0: gmp-4.0.1-s390.patch
 Patch1: gmp-6.0.0-ppc64.patch
 License: LGPLv3+ or GPLv2+
 Group: System Environment/Libraries
@@ -60,9 +59,13 @@ in applications.
 
 %prep
 %setup -q
-%patch0 -p1 -b .s390
 %patch1 -p1 -b .ppc64
 
+# switch the defaults to new cpus on s390x
+%ifarch s390x
+( cd mpn/s390_64; ln -s z10 s390x )
+%endif
+
 %build
 autoreconf -ifv
 if as --help | grep -q execstack; then
@@ -232,6 +235,9 @@ exit 0
 %{_libdir}/libgmpxx.a
 
 %changelog
+* Thu Sep 04 2014 Dan Horák <dan[at]danny.cz> - 1:6.0.0-8
+- drop s390x patch, support is already in upstream
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:6.0.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild