diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 86e329f..057f1d9 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 21 09:50:30 UTC 2016 - fstrba@suse.com
+
+- Added patch:
+  * s390-java-opts.patch
+    - Solve memory issues when building s390 version
+
 -------------------------------------------------------------------
 Tue Jul 26 05:57:42 UTC 2016 - fstrba@suse.com
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 3af0168..3c9a561 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -181,6 +181,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
@@ -494,6 +496,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}
 
diff --git a/s390-java-opts.patch b/s390-java-opts.patch
new file mode 100644
index 0000000..43acad3
--- /dev/null
+++ b/s390-java-opts.patch
@@ -0,0 +1,45 @@
+--- openjdk/common/autoconf/boot-jdk.m4	2016-07-26 12:28:03.054552831 +0200
++++ openjdk/common/autoconf/boot-jdk.m4	2016-07-26 12:30:34.651143737 +0200
+@@ -351,29 +351,29 @@
+   AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
+ 
+   # Starting amount of heap memory.
+-  if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
++  # if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
+     ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs_big,[$JAVA])
+-  else
+-    ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
+-  fi
++  # else
++  #   ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
++  # fi
+ 
+   # Maximum amount of heap memory.
+   # Maximum stack size.
+-  if test "x$BOOT_JDK_BITS" = x32; then
+-    if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
++  # if test "x$BOOT_JDK_BITS" = x32; then
++  #   if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
+       JVM_MAX_HEAP=768M
+-    else
+-      JVM_MAX_HEAP=1100M
+-    fi
++  #   else
++  #     JVM_MAX_HEAP=1100M
++  #   fi
+     STACK_SIZE=768
+-  else
++  # else
+     # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
+     # pointers are used. Apparently, we need to increase the heap and stack
+     # space for the jvm. More specifically, when running javac to build huge
+     # jdk batch
+-    JVM_MAX_HEAP=1600M
+-    STACK_SIZE=1536
+-  fi
++  #   JVM_MAX_HEAP=1600M
++  #   STACK_SIZE=1536
++  # fi
+   ADD_JVM_ARG_IF_OK([-Xmx$JVM_MAX_HEAP],boot_jdk_jvmargs_big,[$JAVA])
+   ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])
+   ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs_big,[$JAVA])