diff --git a/pcp.spec b/pcp.spec
index a57ee52..ebc78c2 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -3,11 +3,13 @@ Name: pcp
 Version: 3.6.3
 %define buildversion 1
 
-Release: %{buildversion}%{?dist}
+Release: %{buildversion}%{?dist}.1
 License: GPLv2
 URL: http://oss.sgi.com/projects/pcp
 Group: Applications/System
 Source0: ftp://oss.sgi.com/projects/pcp/download/pcp-%{version}-%{buildversion}.src.tar.gz
+# recognize s390x as 64-bit arch
+Patch0: pcp_configure_s390x.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: procps autoconf bison flex ncurses-devel readline-devel
@@ -179,6 +181,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
 
 %prep
 %setup -q
+%patch0 -p1 -b .s390x
 autoconf
 %configure
 
@@ -356,6 +359,9 @@ fi
 %defattr(-,root,root)
 
 %changelog
+* Fri May 18 2012 Dan Horák <dan[at]danny.cz> - 3.6.3-1.1
+- fix build on s390x
+
 * Mon Apr 30 2012 Mark Goodwin - 3.6.3-1
 - Update to latest PCP sources
 
diff --git a/pcp_configure_s390x.patch b/pcp_configure_s390x.patch
new file mode 100644
index 0000000..1170ae6
--- /dev/null
+++ b/pcp_configure_s390x.patch
@@ -0,0 +1,12 @@
+diff -up pcp-3.6.3/configure.in.s390x pcp-3.6.3/configure.in
+--- pcp-3.6.3/configure.in.s390x	2012-05-18 12:31:14.000000000 +0200
++++ pcp-3.6.3/configure.in	2012-05-18 12:31:47.000000000 +0200
+@@ -1636,7 +1636,7 @@ if test $target_os = mingw
+ then
+     pcp_lib_dir=/local/bin
+     pcp_lib32_dir=/local/bin
+-elif test $target_os = linux -a \( $target_cpu = x86_64 -o $target_cpu = powerpc64 \) -a $target_distro != debian
++elif test $target_os = linux -a \( $target_cpu = x86_64 -o $target_cpu = powerpc64 -o $target_cpu = s390x \) -a $target_distro != debian
+ then
+     # Linux on x86_64 and ppc64 puts libraries in .../lib64 (and rpmbuild
+     # enforces that convention) but $libdir lies about it.