diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 19bea79..cedc32f 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -196,6 +196,8 @@ Patch14:        zero-javadoc-verbose.patch
 #
 # Patch for PPC
 Patch103:       ppc-zero-hotspot.patch
+# Patch for S390
+Patch104:       s390-java-opts.patch
 Patch1000:      icedtea-3.0.1-sunec.patch
 Patch1001:      java-1_8_0-openjdk-suse-desktop-files.patch
 Patch2000:      java-1_8_0-openjdk-gcc6.patch
@@ -532,6 +534,11 @@ patch -p0 -i %{PATCH14}
 patch -p0 -i %{PATCH103}
 %endif
 
+%ifarch s390
+# S390 memory issues
+patch -p0 -i %{PATCH104}
+%endif
+
 patch -p0 -i %{PATCH2000}
 patch -p0 -i %{PATCH2001}