diff --git a/hdf5-1.8.8-tstlite.patch b/hdf5-1.8.8-tstlite.patch
new file mode 100644
index 0000000..419662e
--- /dev/null
+++ b/hdf5-1.8.8-tstlite.patch
@@ -0,0 +1,24 @@
+diff -up hdf5-1.8.8/hl/fortran/test/Makefile.am.tstlite hdf5-1.8.8/hl/fortran/test/Makefile.am
+--- hdf5-1.8.8/hl/fortran/test/Makefile.am.tstlite	2011-12-21 17:27:14.000000000 +0100
++++ hdf5-1.8.8/hl/fortran/test/Makefile.am	2011-12-21 17:27:29.000000000 +0100
+@@ -33,7 +33,7 @@ else
+ endif
+ 
+ # Our main target, the test programs
+-TEST_PROG=tstds tstlite tstimage tsttable
++TEST_PROG=tstds tstimage tsttable
+ check_PROGRAMS=$(TEST_PROG)
+ 
+ LDADD= $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL)  $(LIBHDF5)
+diff -up hdf5-1.8.8/hl/fortran/test/Makefile.in.tstlite hdf5-1.8.8/hl/fortran/test/Makefile.in
+--- hdf5-1.8.8/hl/fortran/test/Makefile.in.tstlite	2011-12-21 17:27:21.000000000 +0100
++++ hdf5-1.8.8/hl/fortran/test/Makefile.in	2011-12-21 17:27:37.000000000 +0100
+@@ -409,7 +409,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.c
+ 	f1tab.h5 tstds.h5
+ 
+ # Our main target, the test programs
+-TEST_PROG = tstds tstlite tstimage tsttable
++TEST_PROG = tstds tstimage tsttable
+ LDADD = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL)  $(LIBHDF5)
+ 
+ # Source files for the programs
diff --git a/hdf5.spec b/hdf5.spec
index e3d2355..acf3b9d 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -4,7 +4,7 @@
 # You need to recompile all users of HDF5 for each version change
 Name: hdf5
 Version: 1.8.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@@ -12,6 +12,7 @@ URL: http://www.hdfgroup.org/HDF5/
 Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}.tar.bz2
 Source1: h5comp
 Patch0: hdf5-LD_LIBRARY_PATH.patch
+Patch1: hdf5-1.8.8-tstlite.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
 
@@ -130,6 +131,10 @@ HDF5 parallel openmpi static libraries
 #setup -q -n %{name}-%{version}%{?snaprel}
 %setup -q
 %patch0 -p1 -b .LD_LIBRARY_PATH
+%ifarch ppc64 s390x
+# the tstlite test fails with "stack smashing detected" on these arches
+%patch1 -p1 -b .tstlite
+%endif
 #This should be fixed in 1.8.7
 find \( -name '*.[ch]*' -o -name '*.f90' -o -name '*.txt' \) -exec chmod -x {} +
 
@@ -376,6 +381,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 21 2011 Dan Horák <dan[at]danny.cz> 1.8.8-5
+- reintroduce the tstlite patch for ppc64 and s390x
+
 * Thu Dec 01 2011 Caolán McNamara <caolanm@redhat.com> 1.8.8-4
 - Related: rhbz#758334 hdf5 doesn't build on ppc64