diff --git a/.gitignore b/.gitignore
index f3bf720..c99d462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -234,3 +234,4 @@
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b03-4curve.tar.xz
 /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
diff --git a/NEWS b/NEWS
index 5bcec36..734417e 100644
--- a/NEWS
+++ b/NEWS
@@ -12,25 +12,37 @@ Live versions of these release notes can be found at:
 * Security fixes
 * Other changes
   - JDK-6878250: (so) IllegalBlockingModeException thrown when reading from a closed SocketChannel's InputStream
+  - JDK-6990210: [TEST_BUG] EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java fails on gnome
   - JDK-7059970: Test case: javax/imageio/plugins/png/ITXtTest.java is not closing a file
+  - JDK-7106851: Test should not use System.exit
   - JDK-8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
+  - JDK-8028618: [TEST BUG] javax/swing/JScrollBar/bug4202954/bug4202954.java fails
   - JDK-8030123: java/beans/Introspector/Test8027648.java fails
   - JDK-8032050: Clean up for java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java
   - 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-8035000: clean up ActivationLibrary.DestroyThread
   - JDK-8035054: JarFacade.c should not include ctype.h
+  - JDK-8035287: gcc warnings compiling various libraries files
   - JDK-8036095: RMI tests using testlibrary.RMID and testlibrary.JavaVM do not pass through vmoptions
+  - JDK-8037825: Fix warnings and enable "warnings as errors" in serviceability native libraries
   - JDK-8042891: Format issues embedded in macros for two g1 source files
   - JDK-8043264: hsdis library not picked up correctly on expected paths
+  - JDK-8043646: libosxapp.dylib fails to build on Mac OS 10.9 with clang
+  - JDK-8047939: [TESTBUG] Rewrite test/runtime/8001071/Test8001071.sh
   - JDK-8055754: filemap.cpp does not compile with clang
   - JDK-8064909: FragmentMetaspace.java got OutOfMemoryError
   - JDK-8066508: JTReg tests timeout on slow devices when run using JPRT
   - JDK-8066807: langtools/test/Makefile should use -agentvm not -samevm
   - JDK-8071374: -XX:+PrintAssembly -XX:+PrintSignatureHandlers crash fastdebug VM with assert(limit == __null || limit <= nm->code_end()) in RelocIterator::initialize
   - JDK-8073446: TimeZone getOffset API does not return a dst offset between years 2038-2137
+  - JDK-8074835: Resolve disabled warnings for libj2gss
+  - JDK-8074836: Resolve disabled warnings for libosxkrb5
   - 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-8078855: [TEST_BUG] javax/swing/JComboBox/8032878/bug8032878.java fails in WindowsClassicLookAndFeel
+  - JDK-8081764: [TEST_BUG] Test javax/swing/plaf/aqua/CustomComboBoxFocusTest.java fails on Windows, Solaris Sparcv9 and Linux but passes on MacOSX
   - JDK-8129511: PlatformMidi.c:83 uses malloc without malloc header
   - JDK-8130308: Too low memory usage in TestPromotionFromSurvivorToTenuredAfterMinorGC.java
   - JDK-8130430: [TEST_BUG] remove unnecessary internal calls from javax/swing/JRadioButton/8075609/bug8075609.java
@@ -44,6 +56,7 @@ Live versions of these release notes can be found at:
   - JDK-8159898: Negative array size in java/beans/Introspector/Test8027905.java
   - JDK-8166046: [TESTBUG] compiler/stringopts/TestStringObjectInitialization.java fails with OOME
   - JDK-8166724: gc/g1/TestHumongousShrinkHeap.java fails with OOME
+  - JDK-8172188: JDI tests fail due to "permission denied" when creating temp file
   - JDK-8177809: File.lastModified() is losing milliseconds (always ends in 000)
   - JDK-8178403: DirectAudio in JavaSound may hang and leak
   - JDK-8180478: tools/launcher/MultipleJRE.sh fails on Windows because of extra-''
@@ -51,8 +64,10 @@ Live versions of these release notes can be found at:
   - JDK-8190332: PngReader throws NegativeArraySizeException/OOM error when IHDR width is very large
   - JDK-8190679: java/util/Arrays/TimSortStackSize2.java fails with "Initial heap size set to a larger value than the maximum heap size"
   - JDK-8191955: AArch64: incorrect prefetch distance causes an internal error
+  - JDK-8196092: javax/swing/JComboBox/8032878/bug8032878.java fails
   - JDK-8199265: java/util/Arrays/TimSortStackSize2.java fails with OOM
   - JDK-8200550: Xcode 9.3 produce warning -Wexpansion-to-defined
+  - JDK-8202299: Java Keystore fails to load PKCS12/PFX certificates created in WindowsServer2016
   - JDK-8203196: C1 emits incorrect code due to integer overflow in _tableswitch keys
   - JDK-8205014: com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java failed with "Read timed out"
   - JDK-8206243: java -XshowSettings fails if memory.limit_in_bytes overflows LONG.max
@@ -69,14 +84,19 @@ Live versions of these release notes can be found at:
   - JDK-8231841: AArch64: debug.cpp help() is missing an AArch64 line for pns
   - JDK-8231949: [PPC64, s390]: Make async profiling more reliable
   - JDK-8234011: (zipfs) Memory leak in ZipFileSystem.releaseDeflater()
+  - JDK-8239053: [8u] clean up undefined-var-template warnings
+  - JDK-8239400: [8u] clean up undefined-var-template warnings
   - JDK-8241649: Optimize Character.toString
   - JDK-8241829: Cleanup the code for PrinterJob on windows
   - JDK-8242565: Policy initialization issues when the denyAfter constraint is enabled
   - JDK-8243559: Remove root certificates with 1024-bit keys
   - JDK-8247350: [aarch64] assert(false) failed: wrong size of mach node
+  - JDK-8249142: java/awt/FontClass/CreateFont/DeleteFont.sh is unstable
   - JDK-8249278: Revert JDK-8226253 which breaks the spec of AccessibleState.SHOWING for JList
+  - JDK-8250876: Fix issues with cross-compile on macos
   - JDK-8252883: AccessDeniedException caused by delayed file deletion on Windows
   - JDK-8253375: OSX build fails with Xcode 12.0 (12A7209)
+  - JDK-8254631: Better support ALPN byte wire values in SunJSSE
   - JDK-8255086: Update the root locale display names
   - JDK-8255734: VM should ignore SIGXFSZ on ppc64, s390 too
   - JDK-8256818: SSLSocket that is never bound or connected leaks socket resources
@@ -110,10 +130,16 @@ Live versions of these release notes can be found at:
   - JDK-8264562: assert(verify_field_bit(1)) failed: Attempting to write an uninitialized event field: type
   - JDK-8264640: CMS ParScanClosure misses a barrier
   - JDK-8264816: Weak handles leak causes GC to take longer
+  - JDK-8265462: Handle multiple slots in the NSS Internal Module from SunPKCS11's Secmod
   - JDK-8265666: Enable AIX build platform to make external debug symbols
   - JDK-8265832: runtime/StackGap/testme.sh fails to compile in 8u
   - JDK-8265988: Fix sun/text/IntHashtable/Bug4170614 for JDK 8u
   - JDK-8266191: Missing aarch64 parts of JDK-8181872 (C1: possible overflow when strength reducing integer multiply by constant)
+  - JDK-8266723: JFR periodic events are causing extra allocations
+  - 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-8267689: [aarch64] Crash due to bad shift in indirect addressing mode
 * Shenandoah
   - [backport] JDK-8259580: Shenandoah: uninitialized label in VerifyThreadGCState
   - [backport] JDK-8259954: gc/shenandoah/mxbeans tests fail with -Xcomp
@@ -161,6 +187,23 @@ Distinguished Name: CN=Sonera Class2 CA, O=Sonera, C=FI
 
 security-libs/javax.net.ssl:
 
+JDK-8257548: Improve Encoding of TLS Application-Layer Protocol Negotiation (ALPN) Values
+=========================================================================================
+Certain TLS ALPN values couldn't be properly read or written by the
+SunJSSE provider. This is due to the choice of Strings as the API
+interface and the undocumented internal use of the UTF-8 Character Set
+which converts characters larger than U+00007F (7-bit ASCII) into
+multi-byte arrays that may not be expected by a peer.
+
+ALPN values are now represented using the network byte representation
+expected by the peer, which should require no modification for
+standard 7-bit ASCII-based character Strings. However, SunJSSE now
+encodes/decodes String characters as 8-bit ISO_8859_1/LATIN-1
+characters.  This means applications that used characters above
+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.
+
 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 c710d66..d14175c 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -296,7 +296,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-b04
+%global shenandoah_revision    	aarch64-shenandoah-jdk8u302-b05
 # Define old aarch64/jdk8u tree variables for compatibility
 %global project         %{shenandoah_project}
 %global repo            %{shenandoah_repo}
@@ -2582,6 +2582,10 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Fri Jul 02 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.302.b05-0.0.ea
+- Update to aarch64-shenandoah-jdk8u302-b05 (EA)
+- Update release notes for 8u302-b05.
+
 * Wed Jun 30 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.302.b04-0.0.ea
 - Update to aarch64-shenandoah-jdk8u302-b04 (EA)
 - Update release notes for 8u302-b04.
diff --git a/sources b/sources
index 07a777b..33af4d9 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-b04-4curve.tar.xz) = 4b49ae51eb4366e7b812ea9cd852af2ed0aa6b7b5a720598ecd3a7734968fa135e3d68b2ec9439b169e6197205b715763adf247831455163d63955d418a14c83
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b05-4curve.tar.xz) = 4034420e63d98b2268ee6c762a2c79528271d42e7c423a1fd27147e5e8479b2af94345bccae6a09789397627ff5c34ae77e010a30ae042c62df3d7e79a24fe8c