diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 11b6962..0a99aa9 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -224,8 +224,6 @@ Patch12:        adlc-parser.patch
 Patch13:        implicit-pointer-decl.patch
 # Avoid triggering inactivity timeout while generating javadoc in zero VM
 Patch14:        zero-javadoc-verbose.patch
-# Fix crash on zero virtual machine built with gcc5
-Patch16:        zero-dummy.patch
 #
 # OpenJDK specific patches
 #
@@ -514,7 +512,6 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 
 %if %{with zero}
 %patch14 -p1
-%patch16 -p1
 %endif
 
 %ifarch s390
diff --git a/zero-dummy.patch b/zero-dummy.patch
deleted file mode 100644
index 31c3e85..0000000
--- a/zero-dummy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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) {