diff --git a/.gitignore b/.gitignore
index c99d462..cce8a4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -235,3 +235,4 @@
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b03-shenandoah-merge-2021-06-23-4curve.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b04-4curve.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b05-4curve.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b06-4curve.tar.xz
diff --git a/NEWS b/NEWS
index 734417e..541c395 100644
--- a/NEWS
+++ b/NEWS
@@ -139,7 +139,9 @@ Live versions of these release notes can be found at:
   - JDK-8266929: Unable to use algorithms from 3p providers
   - JDK-8267235: [macos_aarch64] InterpreterRuntime::throw_pending_exception messing up LR results in crash
   - JDK-8267426: MonitorVmStartTerminate test timed out on Embedded VM
+  - JDK-8267545: [8u] Enable Xcode 12 builds on macOS
   - JDK-8267689: [aarch64] Crash due to bad shift in indirect addressing mode
+  - JDK-8268444: keytool -v -list print is incorrect after backport JDK-8141457
 * Shenandoah
   - [backport] JDK-8259580: Shenandoah: uninitialized label in VerifyThreadGCState
   - [backport] JDK-8259954: gc/shenandoah/mxbeans tests fail with -Xcomp
@@ -204,6 +206,10 @@ U+000007F that were previously encoded using UTF-8 may need to either
 be modified to perform the UTF-8 conversion, or set the Java security
 property `jdk.tls.alpnCharset` to "UTF-8" revert the behavior.
 
+See the updated guide at
+https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/alpn.html
+for more information.
+
 JDK-8244460: Support for certificate_authorities Extension
 ==========================================================
 The "certificate_authorities" extension is an optional extension
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 93ed25b..93ed221 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -294,7 +294,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-jdk8u302-b05
+%global shenandoah_revision    	aarch64-shenandoah-jdk8u302-b06
 # Define old aarch64/jdk8u tree variables for compatibility
 %global project         %{shenandoah_project}
 %global repo            %{shenandoah_repo}
@@ -309,7 +309,7 @@
 %global updatever       %(VERSION=%{whole_update}; echo ${VERSION##*u})
 # eg jdk8u60-b27 -> b27
 %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease      1
+%global rpmrelease      0
 # Define milestone (EA for pre-releases, GA ("fcs") for releases)
 # Release will be (where N is usually a number starting at 1):
 # - 0.N%%{?extraver}%%{?dist} for EA releases,
@@ -2580,6 +2580,10 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Tue Jul 06 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.302.b06-0.0.ea
+- Update to aarch64-shenandoah-jdk8u302-b06 (EA)
+- Update release notes for 8u302-b06.
+
 * Mon Jul 05 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.302.b05-0.1.ea
 - Use the "reverse" build loop (debug first) as the main and only build loop to get more diagnostics.
 
diff --git a/sources b/sources
index 33af4d9..84c12ad 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b05-4curve.tar.xz) = 4034420e63d98b2268ee6c762a2c79528271d42e7c423a1fd27147e5e8479b2af94345bccae6a09789397627ff5c34ae77e010a30ae042c62df3d7e79a24fe8c
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b06-4curve.tar.xz) = d6dfc358151a11c1ce81aabae82aba2b57f020be21100eb4b29fc4cc16bd13865450a36642cef8755fddbfde5a355c9001fbb6338ccab370b2ab9f38125ecdc8