diff --git a/8167200.hotspotAarch64.patch b/8167200.hotspotAarch64.patch
new file mode 100644
index 0000000..754df89
--- /dev/null
+++ b/8167200.hotspotAarch64.patch
@@ -0,0 +1,37 @@
+
+# HG changeset patch
+# User aph
+# Date 1475745921 0
+# Node ID 60a8cbf7030e4de40050472705776509fa9cb960
+# Parent  d9960bd9fb6d3a5ac0450a47d70f3a3afd7f515d
+8167200: AArch64: Broken stack pointer adjustment in interpreter
+Summary: Always adjust SP unconditionally
+Reviewed-by: dlong, kbarrett
+
+diff -r d9960bd9fb6d -r 60a8cbf7030e src/cpu/aarch64/vm/templateTable_aarch64.cpp
+--- openjdk/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp	Tue May 24 08:47:37 2016 -0700
++++ openjdk/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp	Thu Oct 06 09:25:21 2016 +0000
+@@ -3717,19 +3717,15 @@
+ 
+   // allocate one if there's no free slot
+   {
+-    Label entry, loop, no_adjust;
++    Label entry, loop;
+     // 1. compute new pointers            // rsp: old expression stack top
+     __ ldr(c_rarg1, monitor_block_bot);   // c_rarg1: old expression stack bottom
+-    __ sub(esp, esp, entry_size);           // move expression stack top
++    __ sub(esp, esp, entry_size);         // move expression stack top
+     __ sub(c_rarg1, c_rarg1, entry_size); // move expression stack bottom
+     __ mov(c_rarg3, esp);                 // set start value for copy loop
+     __ str(c_rarg1, monitor_block_bot);   // set new monitor block bottom
+ 
+-    __ cmp(sp, c_rarg3);                  // Check if we need to move sp
+-    __ br(Assembler::LO, no_adjust);      // to allow more stack space
+-					  // for our new esp
+-    __ sub(sp, sp, 2 * wordSize);
+-    __ bind(no_adjust);
++    __ sub(sp, sp, entry_size);           // make room for the monitor
+ 
+     __ b(entry);
+     // 2. move expression stack contents
+
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 3ee1957..f284cb6 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -794,7 +794,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 3.%{buildver}%{?dist}
+Release: 4.%{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
@@ -938,6 +938,9 @@ Patch606: 8154210.patch
 # S8158260, PR2991, RH1341258: JVM on PPC64 LE crashes due to an illegal instruction in JITed code
 Patch524: 8158260-pr2991-rh1341258.patch
 
+# Patches upstream and appearing in 8u122
+Patch607: 8167200.hotspotAarch64.patch
+
 # Patches ineligible for 8u
 # 8043805: Allow using a system-installed libjpeg
 Patch201: system-libjpeg.patch
@@ -1281,6 +1284,8 @@ sh %{SOURCE12}
 %patch531
 %patch532
 
+%patch607
+
 # Extract systemtap tapsets
 %if %{with_systemtap}
 tar -x -I xz -f %{SOURCE8}
@@ -1875,6 +1880,9 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Wed Oct 5 2016  Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.102-4.b14
+- added patch for failing scala stuff
+
 * Wed Oct 5 2016  Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.102-3.b14
 - debug subpackages allowed on aarch64 and ppc64le
 - fontconfig and nss restricted by isa