diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 27a97d4..c78f7e8 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 10 08:10:23 UTC 2015 - fstrba@suse.com
+
+- Added patch:
+  * zero-dummy.patch
+    - Fix crash of ZERO VM built with gcc5
+
 -------------------------------------------------------------------
 Fri Jun  5 12:58:27 UTC 2015 - fstrba@suse.com
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 756ab45..f4fdeb0 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -225,6 +225,8 @@ Patch13:        implicit-pointer-decl.patch
 Patch14:        zero-javadoc-verbose.patch
 # Fix to build the C++ interpreter that does not have Interpreter::remove_activation_entry
 Patch15:        cplusplus-interpreter.patch
+# Fix crash on zero virtual machine built with gcc5
+Patch16:        zero-dummy.patch
 #
 # OpenJDK specific patches
 #
@@ -311,7 +313,7 @@ BuildRequires:  libXinerama-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXtst-devel
 %endif
-%if %{bootcycle}
+%if %{bootcycle}5321d26956b2
 BuildRequires:  java-bootstrap-devel >= 1.6.0
 %else
 BuildRequires:  java-devel >= %{javaver}
@@ -519,6 +521,7 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 
 %if %{with zero}
 %patch14 -p1
+%patch16 -p1
 %endif
 
 %ifnarch %aarch64
diff --git a/zero-dummy.patch b/zero-dummy.patch
new file mode 100644
index 0000000..31c3e85
--- /dev/null
+++ b/zero-dummy.patch
@@ -0,0 +1,13 @@
+--- jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	2015-06-10 10:06:49.485230587 +0200
++++ jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	2015-06-10 10:07:33.645229254 +0200
+@@ -55,8 +55,8 @@
+ #include "utilities/vmError.hpp"
+ 
+ address os::current_stack_pointer() {
+-  address dummy = (address) &dummy;
+-  return dummy;
++  // return the address of the current function
++  return (address)__builtin_frame_address(0);
+ }
+ 
+ frame os::get_sender_for_C_frame(frame* fr) {