diff --git a/libatomic_ops-1.2-s390-include.patch b/libatomic_ops-1.2-s390-include.patch
new file mode 100644
index 0000000..e2875af
--- /dev/null
+++ b/libatomic_ops-1.2-s390-include.patch
@@ -0,0 +1,14 @@
+diff -Nrup libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/gcc/s390.h libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/s390.h
+--- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/gcc/s390.h	2009-05-20 10:22:59.000000000 +0200
++++ libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/s390.h	2005-01-11 01:19:06.000000000 +0100
+@@ -30,8 +30,8 @@
+ /*   may be delayed.  Otherwise everything is ordered.		*/
+ /* - There is a hardware compare-and-swap (CS) instruction.	*/
+ 
+-#include "ordered_except_wr.h"
+-#include "all_aligned_atomic_load_store.h"
++#include "../ordered_except_wr.h"
++#include "../all_aligned_atomic_load_store.h"
+ 
+ #include "../test_and_set_t_is_ao_t.h"
+ /* FIXME: Is there a way to do byte-sized test-and-set?	*/
diff --git a/libatomic_ops.spec b/libatomic_ops.spec
index 7c64100..a83158d 100644
--- a/libatomic_ops.spec
+++ b/libatomic_ops.spec
@@ -4,7 +4,7 @@
 
 Name:           libatomic_ops
 Version:        1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Atomic memory update operations
 
 Group:          Development/Libraries
@@ -14,6 +14,7 @@ Source0:        http://www.hpl.hp.com/research/linux/atomic_ops/download/%{name}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:		libatomic_ops-1.2-ppclwzfix.patch
+Patch2:		libatomic_ops-1.2-s390-include.patch
 
 %description
 Provides implementations for atomic memory update operations on a
@@ -38,6 +39,7 @@ that involves minimum overhead across a variety of architectures.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 chmod a-x src/*.h
 
 %build
@@ -66,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May 20 2009 Dan Horak <dan[t]danny.cz> - 1.2-6
+- added fix for s390
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild