diff --git a/java-1.8.0-openjdk-s390-java-opts.patch b/java-1.8.0-openjdk-s390-java-opts.patch
index 9e2b5b8..3f0cf39 100644
--- a/java-1.8.0-openjdk-s390-java-opts.patch
+++ b/java-1.8.0-openjdk-s390-java-opts.patch
@@ -1,7 +1,7 @@
 diff -up jdk8/common/autoconf/boot-jdk.m4.s390 jdk8/common/autoconf/boot-jdk.m4
---- jdk8/common/autoconf/boot-jdk.m4.s390	2014-10-28 13:10:36.000000000 -0400
-+++ jdk8/common/autoconf/boot-jdk.m4	2015-01-09 15:49:45.443809100 -0500
-@@ -319,21 +319,12 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR
+--- jdk8/common/autoconf/boot-jdk.m4.s390	2016-02-16 16:18:10.000000000 +0100
++++ jdk8/common/autoconf/boot-jdk.m4	2016-02-16 16:21:44.000000000 +0100
+@@ -329,21 +329,12 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR
    AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
  
    # Starting amount of heap memory.
@@ -10,7 +10,7 @@ diff -up jdk8/common/autoconf/boot-jdk.m4.s390 jdk8/common/autoconf/boot-jdk.m4
  
    # Maximum amount of heap memory.
    # Maximum stack size.
--  if test "x$BUILD_NUM_BITS" = x32; then
+-  if test "x$BOOT_JDK_BITS" = x32; then
 -    JVM_MAX_HEAP=1100M
 +    JVM_MAX_HEAP=768M
      STACK_SIZE=768
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 22db542..5c2863b 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -735,7 +735,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 7.%{buildver}%{?dist}
+Release: 8.%{buildver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -1695,6 +1695,9 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Tue Feb 16 2016 Dan Horák <dan[at]danny.cz> - 1:1.8.0.72-8.b15
+- Refresh s390-java-opts patch
+
 * Tue Feb 16 2016 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.72-7.b15
 - Use -fno-lifetime-dse over -fno-guess-branch-probability.
   See RHBZ#1306558.