diff --git a/openssl.spec b/openssl.spec
index 2dcb05c..a2359eb 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -5,7 +5,7 @@
 Summary: Secure Sockets Layer Toolkit
 Name: openssl
 Version: 0.9.6
-Release: 9.1ppc
+Release: 9.71.0sx
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -13,7 +13,7 @@ Source3: http://download.sourceforge.net/swig/swig%{swig_version}.tar.gz
 Source4: http://mars.post1.com/home/ngps/m2/m2crypto-%{m2crypto_version}.zip
 Source5: ca-bundle.crt
 Source6: RHNS-CA-CERT
-Patch0: openssl-0.9.6-redhat.patch
+Patch0: openssl-0.9.6-redhatx.patch
 Patch1: openssl-0.9.5-rsanull.patch
 Patch2: openssl-0.9.5a-64.patch
 Patch3: openssl-0.9.5a-defaults.patch
@@ -34,13 +34,6 @@ URL: http://www.openssl.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPreReq: perl, python-devel, unzip
 
-# the gcc-2.96 compiler on ppc has some optimization problems.
-# gcc296ppc is true in this case.
-%define gcc296ppc 0
-%ifarch ppc ppc64
-%define gcc296ppc %(gcc -v 2>&1 1>/dev/null|grep -qF 2.96 && echo 1 || echo 0)
-%endif
-
 %description
 The OpenSSL certificate management tool and the shared libraries that
 provide various cryptographic algorithms and protocols.
@@ -120,11 +113,6 @@ chmod 644 doc/ssleay.txt
 ln -sf ../../crypto/opensslconf.h include/openssl/
 
 %build 
-
-%if %{gcc296ppc}
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O1"
-%endif
-
 PATH=${PATH}:${PWD}/bin
 TOPDIR=${PWD}
 LD_LIBRARY_PATH=${TOPDIR}:${PATH} ; export LD_LIBRARY_PATH
@@ -151,6 +139,9 @@ sslflags=no-asm
 %ifarch s390
 sslarch=linux-s390
 %endif
+%ifarch s390x
+sslarch=linux-s390x
+%endif
 # Configure the build tree.  Override OpenSSL defaults with known-good defaults
 # usable on all platforms.  The Configure script already knows to use -fPIC and
 # RPM_OPT_FLAGS, so we can skip specifiying them here.
@@ -291,6 +282,9 @@ popd
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Jan 25 2002 David Sainty <dsainty@redhat.com>
+- s390x support added in redhatx patch (renamed redhat patch) and spec.
+
 * Wed Jul 11 2001 Nalin Dahyabhai <nalin@redhat.com>
 - add patches to fix PRNG flaws, supplied by Bodo Moeller and the OpenSSL Group
 
@@ -432,13 +426,13 @@ popd
 - run ldconfig directly in post/postun
 - add FAQ
 
-* Sat Dec 18 1999 Bernhard Rosenkrdnzer <bero@redhat.de>
+* Sat Dec 18 1999 Bernhard Rosenkr)Bänzer <bero@redhat.de>
 - Fix build on non-x86 platforms
 
-* Fri Nov 12 1999 Bernhard Rosenkrdnzer <bero@redhat.de>
+* Fri Nov 12 1999 Bernhard Rosenkr)Bänzer <bero@redhat.de>
 - move /usr/share/ssl/* from -devel to main package
 
-* Tue Oct 26 1999 Bernhard Rosenkrdnzer <bero@redhat.de>
+* Tue Oct 26 1999 Bernhard Rosenkr)Bänzer <bero@redhat.de>
 - inital packaging
 - changes from base:
   - Move /usr/local/ssl to /usr/share/ssl for FHS compliance