diff --git a/gmp-4.0.1-s390.patch b/gmp-4.0.1-s390.patch
index 017c7e1..69d540b 100644
--- a/gmp-4.0.1-s390.patch
+++ b/gmp-4.0.1-s390.patch
@@ -1,17 +1,6 @@
---- gmp-4.0.1/mpn/s390/gmp-mparam.h.s390	Wed May 15 21:32:57 2002
-+++ gmp-4.0.1/mpn/s390/gmp-mparam.h	Wed May 15 21:33:21 2002
-@@ -20,7 +20,8 @@
- MA 02111-1307, USA. */
- 
- 
--/* BITS_PER_MP_LIMB etc generated by configure */
-+#define BITS_PER_MP_LIMB 32
-+#define BYTES_PER_MP_LIMB 4
- 
- 
- /* Generated by tuneup.c, 2001-09-26, gcc 2.95 */
---- ./mpn/s390x/gmp-mparam.h
-+++ ./mpn/s390x/gmp-mparam.h
+diff -up /dev/null gmp-4.2.2/mpn/s390x/gmp-mparam.h
+--- /dev/null	2008-09-01 10:12:52.609021969 +0200
++++ gmp-4.2.2/mpn/s390x/gmp-mparam.h	2008-09-01 13:04:05.000000000 +0200
 @@ -0,0 +1,27 @@
 +/* gmp-mparam.h -- Compiler/machine parameter header file.
 +
@@ -40,12 +29,26 @@
 +#define BITS_PER_INT 32
 +#define BITS_PER_SHORTINT 16
 +#define BITS_PER_CHAR 8
---- ./configure.in
-+++ ./configure.in
-@@ -620,6 +620,11 @@
+diff -up gmp-4.2.2/mpn/s390/gmp-mparam.h.s390 gmp-4.2.2/mpn/s390/gmp-mparam.h
+--- gmp-4.2.2/mpn/s390/gmp-mparam.h.s390	2007-08-30 20:31:41.000000000 +0200
++++ gmp-4.2.2/mpn/s390/gmp-mparam.h	2008-09-01 13:04:05.000000000 +0200
+@@ -18,7 +18,8 @@ You should have received a copy of the G
+ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
+ 
+ 
+-/* BITS_PER_MP_LIMB etc generated by configure */
++#define BITS_PER_MP_LIMB 32
++#define BYTES_PER_MP_LIMB 4
+ 
+ 
+ /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */
+diff -up gmp-4.2.2/configure.in.s390 gmp-4.2.2/configure.in
+--- gmp-4.2.2/configure.in.s390	2007-09-09 18:39:14.000000000 +0200
++++ gmp-4.2.2/configure.in	2008-09-01 13:04:05.000000000 +0200
+@@ -1054,6 +1054,11 @@ case $host in
      ;;
-
-
+ 
+ 
 +  s390x-*-*)
 +    gcc_cflags="-g -O2 $fomit_frame_pointer"
 +    path="s390x"
@@ -53,4 +56,4 @@
 +    ;;
    # IBM s/370 and similar
    [s3[6-9]0*-*-*])
-     gcc_cflags="-g -O2 $fomit_frame_pointer"
+     gcc_cflags="-O2 $fomit_frame_pointer"
diff --git a/gmp.spec b/gmp.spec
index 6cb482f..47c3f63 100644
--- a/gmp.spec
+++ b/gmp.spec
@@ -61,7 +61,7 @@ in applications.
 
 %prep
 %setup -q 
-%patch0 -p1
+%patch0 -p1 -b .s390
 %patch2 -p1
 %patch3 -p1 -b .std