diff --git a/.gitignore b/.gitignore
index 307786d..4a7e0a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,3 +158,10 @@
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u232-b07.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u232-b08.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u232-b09.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b01.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b02.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b04.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b05.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b06.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b07.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b08.tar.xz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 367cfdc..f0d213e 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -218,7 +218,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-jdk8u232-b09
+%global shenandoah_revision    	aarch64-shenandoah-jdk8u242-b08
 # Define old aarch64/jdk8u tree variables for compatibility
 %global project         %{shenandoah_project}
 %global repo            %{shenandoah_repo}
@@ -1124,9 +1124,9 @@ Patch530: pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_pr
 # PR3575, RH1567204: System cacerts database handling should not affect jssecacerts
 Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
 # PR3183, RH1340845: Support Fedora/RHEL8 system crypto policy
-Patch300: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
+Patch400: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
 # PR3655: Allow use of system crypto policy to be disabled by the user
-Patch301: pr3655-toggle_system_crypto_policy.patch
+Patch401: pr3655-toggle_system_crypto_policy.patch
 # JDK-8219772: EXTRA_CFLAGS not being picked up for assembler files
 Patch110: jdk8219772-extra_c_cxx_flags_not_picked_for_assembler_source.patch
 
@@ -1163,7 +1163,7 @@ Patch107: s390-8214206_fix.patch
 # This fixes printf warnings that lead to build failure with -Werror=format-security from optflags
 Patch502: pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch
 # S8154313: Generated javadoc scattered all over the place
-Patch400: jdk8154313-generated_javadoc_scattered_all_over_the_place.patch
+Patch578: jdk8154313-generated_javadoc_scattered_all_over_the_place.patch
 # PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
 Patch571: jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
 # 8143245, PR3548: Zero build requires disabled warnings
@@ -1516,8 +1516,8 @@ sh %{SOURCE12}
 %patch203
 
 # System security policy fixes
-%patch300
-%patch301
+%patch400
+%patch401
 
 %patch1
 %patch3
@@ -1538,7 +1538,7 @@ sh %{SOURCE12}
 %patch502
 %patch504
 %patch512
-%patch400
+%patch578
 %patch523
 %patch528
 %patch529
@@ -2191,6 +2191,10 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Wed Jan 15 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.242.b08-0
+- Update to aarch64-shenandoah-jdk8u242-b08.
+- Fix patch numbering to avoid conflicts with other versions of this spec file.
+
 * Fri Oct 11 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.232.b09-0
 - Update to aarch64-shenandoah-jdk8u232-b09.
 - Switch to GA mode for final release.
diff --git a/sources b/sources
index aeb61a0..d5868e4 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-jdk8u232-b09.tar.xz) = 12126c417378c3f7e961e3e795c58d599985a5132db617ed43138135ae7d8e67a342c0c6a4e5718a84300e7251b0bbf04e0b54525bfd72951fb73c9215f14c77
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b08.tar.xz) = 5102b72f47c53834942a2b970e0019f9de4fff32e4146bddfb8e0abcbf7805aa07456afb43fb9130cc3c1fd6d94bc0ab2e851d1d133fe2ec2a0fcffde3e288af