diff --git a/freeipa.spec b/freeipa.spec
index 68d7bb2..b682914 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -8,7 +8,7 @@
 
 Name:           freeipa
 Version:        3.3.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -366,8 +366,8 @@ done
 # Fedora spec file only: END
 
 %build
-%ifarch ppc %{power64}
-# UI compilation segfaulted on ppc platforms when stack was lower (#1040576)
+%ifarch ppc %{power64} s390 s390x
+# UI compilation segfaulted on some arches when the stack was lower (#1040576)
 export JAVA_STACK_SIZE="8m"
 %endif
 export CFLAGS="$CFLAGS %{optflags}"
@@ -894,6 +894,9 @@ fi
 %endif # ONLY_CLIENT
 
 %changelog
+* Fri Jan 3 2014 Martin Kosek <mkosek@redhat.com> - 3.3.3-5
+- Build crashed with rhino exception on s390 architectures (#1040576)
+
 * Thu Dec 12 2013 Martin Kosek <mkosek@redhat.com> - 3.3.3-4
 - Build crashed with rhino exception on PPC architectures (#1040576)