diff --git a/.gitignore b/.gitignore
index d8def8d..0eb9e5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,3 +141,7 @@
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b04.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b05.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b06.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index e7e63bb..ce896e3 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -217,7 +217,7 @@
 # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
 %global shenandoah_project	aarch64-port
 %global shenandoah_repo		jdk8u-shenandoah
-%global shenandoah_revision    	aarch64-shenandoah-jdk8u222-b03
+%global shenandoah_revision    	aarch64-shenandoah-jdk8u222-b07
 # Define old aarch64/jdk8u tree variables for compatibility
 %global project         %{shenandoah_project}
 %global repo            %{shenandoah_repo}
@@ -1190,9 +1190,6 @@ Patch202: jdk8035341-allow_using_system_installed_libpng.patch
 Patch203: jdk8042159-allow_using_system_installed_lcms2.patch
 # 8210761: libjsig is being compiled without optimization
 Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
-# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
-#          Aarch64-port 8u local part
-Patch624: jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
 # JDK-8223219: Backport of JDK-8199552 to OpenJDK 8 leads to duplicate -fstack-protector flags,
 #              overriding --with-extra-cflags
 Patch626: jdk8223219-fstack-protector-root.patch
@@ -1600,7 +1597,6 @@ sh %{SOURCE12}
 %patch575
 %patch577
 %patch620
-%patch624
 %patch626
 %patch627
 %patch110
@@ -2262,6 +2258,10 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Mon Jul 08 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.222.b07-0.0.ea
+- Update to aarch64-shenandoah-jdk8u222-b07 and Shenandoah merge 2019-06-13.
+- Drop remaining JDK-8210425/RH1632174 patch now AArch64 part is upstream.
+
 * Mon Jul 08 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.222.b03-0.0.ea
 - Update to aarch64-shenandoah-jdk8u222-b03.
 - Drop 8210425 patches applied upstream. Still need to add AArch64 version in aarch64/shenandoah-jdk8u.
diff --git a/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch b/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
deleted file mode 100644
index cf1b40b..0000000
--- a/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git openjdk.orig/hotspot/make/linux/makefiles/aarch64.make openjdk/hotspot/make/linux/makefiles/aarch64.make
-index 3d17326..7cdb498 100644
---- openjdk.orig/hotspot/make/linux/makefiles/aarch64.make
-+++ openjdk/hotspot/make/linux/makefiles/aarch64.make
-@@ -22,10 +22,13 @@
- #  
- #
- 
--# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
--# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+  OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+  OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+else
-+  OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+  OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
- # Must also specify if CPU is little endian
- CFLAGS += -DVM_LITTLE_ENDIAN
- 
diff --git a/sources b/sources
index 9e15789..5671c4a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz) = d7ca2c2b92ca21384c1a4f2f1f9a0335a941de4c24c6a54ce8a323ae0b61eb1ef9cb9d399cd9299841a1e9a2484375acb26db29fbd8b9b982b45d21442b88026
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz) = f58e5ac864cd66a39f4e479982ff236c8fa560c4108a1e13e11f3dcee1d1c3cbcb8383c8f144bea0c7059eb77f80f0628eb91e93b77a86f75bd84a28382be66c