diff --git a/.gitignore b/.gitignore
index 9391a81..4eefa2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b01-4curve.tar.xz
+SOURCES/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b02-4curve.tar.xz
 SOURCES/tapsets-icedtea-3.15.0.tar.xz
diff --git a/.java-1.8.0-openjdk.metadata b/.java-1.8.0-openjdk.metadata
index ea314d0..03933a1 100644
--- a/.java-1.8.0-openjdk.metadata
+++ b/.java-1.8.0-openjdk.metadata
@@ -1,2 +1,2 @@
-cbde578ed3426538011ff4802997426746b08a31 SOURCES/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b01-4curve.tar.xz
+c3bf1b8a0bd48538699d528bb760b57c135dd3b0 SOURCES/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b02-4curve.tar.xz
 7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz
diff --git a/SOURCES/NEWS b/SOURCES/NEWS
index b78d9ce..95a3b38 100644
--- a/SOURCES/NEWS
+++ b/SOURCES/NEWS
@@ -15,6 +15,9 @@ Live versions of these release notes can be found at:
   - JDK-7059970: Test case: javax/imageio/plugins/png/ITXtTest.java is not closing a file
   - JDK-8030123: java/beans/Introspector/Test8027648.java fails
   - JDK-8033289: clang: clean up unused function warning
+  - JDK-8034856: gcc warnings compiling src/solaris/native/sun/security/pkcs11
+  - JDK-8034857: gcc warnings compiling src/solaris/native/sun/management
+  - JDK-8035054: JarFacade.c should not include ctype.h
   - JDK-8036095: RMI tests using testlibrary.RMID and testlibrary.JavaVM do not pass through vmoptions
   - JDK-8042891: Format issues embedded in macros for two g1 source files
   - JDK-8055754: filemap.cpp does not compile with clang
@@ -25,6 +28,7 @@ Live versions of these release notes can be found at:
   - JDK-8073446: TimeZone getOffset API does not return a dst offset between years 2038-2137
   - JDK-8075071: [TEST_BUG] TimSortStackSize2.java: OOME: Java heap space: MaxHeap shrinked by MaxRAMFraction
   - JDK-8077364: "if( !this )" construct prevents build on Xcode 6.3
+  - JDK-8129511: PlatformMidi.c:83 uses malloc without malloc header
   - JDK-8130308: Too low memory usage in TestPromotionFromSurvivorToTenuredAfterMinorGC.java
   - JDK-8132148: G1 hs_err region dump legend out of sync with region values
   - JDK-8132709: [TESTBUG] gc/g1/TestHumongousShrinkHeap.java might fail on embedded
diff --git a/SPECS/java-1.8.0-openjdk.spec b/SPECS/java-1.8.0-openjdk.spec
index 5c35620..de84152 100644
--- a/SPECS/java-1.8.0-openjdk.spec
+++ b/SPECS/java-1.8.0-openjdk.spec
@@ -263,7 +263,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-b01
+%global shenandoah_revision    	aarch64-shenandoah-jdk8u302-b02
 # Define old aarch64/jdk8u tree variables for compatibility
 %global project         %{shenandoah_project}
 %global repo            %{shenandoah_repo}
@@ -279,7 +279,7 @@
 %global updatever       %(VERSION=%{whole_update}; echo ${VERSION##*u})
 # eg jdk8u60-b27 -> b27
 %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease      3
+%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,
@@ -2402,6 +2402,11 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Sat Jun 26 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.302.b02-0.0.ea
+- Update to aarch64-shenandoah-jdk8u302-b02 (EA)
+- Update release notes for 8u302-b02.
+- Resolves: rhbz#1967812
+
 * Mon Jun 21 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.302.b01-0.3.ea
 - Add ppc64le and aarch64 to fastdebug_arches
 - Resolves: rhbz#1969254