diff --git a/SOURCES/rh1201393.patch b/SOURCES/rh1201393.patch
new file mode 100644
index 0000000..66590fb
--- /dev/null
+++ b/SOURCES/rh1201393.patch
@@ -0,0 +1,35 @@
+diff -r 878d6bf3d038 src/cpu/ppc/vm/interpreter_ppc.cpp
+--- openjdk/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp	Tue Feb 03 11:32:50 2015 +0100
++++ openjdk/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp	Wed Apr 22 11:36:38 2015 +0200
+@@ -475,7 +475,7 @@
+ 
+   // This is not a leaf but we have a JavaFrameAnchor now and we will
+   // check (create) exceptions afterward so this is ok.
+-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_AbstractMethodError));
++  __ call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_AbstractMethodError), R16_thread);
+ 
+   // Pop the C frame and restore LR.
+   __ pop_frame();
+diff -r 878d6bf3d038 src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
+--- openjdk/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	Tue Feb 03 11:32:50 2015 +0100
++++ openjdk/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	Wed Apr 22 11:36:38 2015 +0200
+@@ -302,6 +302,7 @@
+         goto report_and_die;
+       }
+ 
++      CodeBlob *cb = NULL;
+       // Handle signal from NativeJump::patch_verified_entry().
+       if (( TrapBasedNotEntrantChecks && sig == SIGTRAP && nativeInstruction_at(pc)->is_sigtrap_zombie_not_entrant()) ||
+           (!TrapBasedNotEntrantChecks && sig == SIGILL  && nativeInstruction_at(pc)->is_sigill_zombie_not_entrant())) {
+@@ -316,7 +317,10 @@
+                // especially when we try to read from the safepoint polling page. So the check
+                //   (address)info->si_addr == os::get_standard_polling_page()
+                // doesn't work for us. We use:
+-               ((NativeInstruction*)pc)->is_safepoint_poll()) {
++               ((NativeInstruction*)pc)->is_safepoint_poll() &&               
++               CodeCache::contains((void*) pc) && 
++               ((cb = CodeCache::find_blob(pc)) != NULL) &&
++               cb->is_nmethod()) {
+         if (TraceTraps)
+           tty->print_cr("trap: safepoint_poll at " INTPTR_FORMAT " (SIGSEGV)", pc);
+         stub = SharedRuntime::get_poll_stub(pc);
diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec
index cfcbd71..5890ab0 100644
--- a/SPECS/java-1.7.0-openjdk.spec
+++ b/SPECS/java-1.7.0-openjdk.spec
@@ -170,7 +170,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: %{icedtea_version}.1%{?dist}
+Release: %{icedtea_version}.2%{?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
@@ -295,6 +295,9 @@ Patch403: PStack-808293.patch
 Patch404: rh1191652-hotspot.patch
 Patch405: rh1191652-jdk.patch
 
+# RH1201393; remove when we move to 2.5.6/2.6.x
+Patch406: rh1201393.patch
+
 # End of tmp patches
 
 BuildRequires: autoconf
@@ -583,6 +586,7 @@ tar xzf %{SOURCE9}
 %patch404
 %endif
 %patch405
+%patch406
 
 %build
 # How many cpu's do we have?
@@ -1557,11 +1561,15 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
-* Fri Apr 10 2015 Jiri Vanek <jvanek@redhat.com> - 1:1.7.0.75-2.5.5.1
+* Fri Apr 24 2015 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.7.0.79-2.5.5.2
+- Fix crash on ppc64le when running Apache Oozie
+- Resolves: rhbz#1220273
+
+* Fri Apr 10 2015 Jiri Vanek <jvanek@redhat.com> - 1:1.7.0.79-2.5.5.1
 - repacked sources
 - Resolves: rhbz#1209072
 
-* Tue Apr 07 2015 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.7.0.75-2.5.5.0
+* Tue Apr 07 2015 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.7.0.79-2.5.5.0
 - Bump to 2.5.5 using OpenJDK 7u79 b14.
 - Update OpenJDK tarball creation comments
 - Remove test case for RH1191652 now fix has been verified.