diff --git a/.gitignore b/.gitignore
index 402cdf4..f34cedd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -243,3 +243,4 @@
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u312-b02-4curve.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u312-b03-4curve.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u312-b04-4curve.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u312-b05-4curve.tar.xz
diff --git a/NEWS b/NEWS
index 832ad01..05c1b39 100644
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,9 @@ Live versions of these release notes can be found at:
 * Other changes
   - JDK-6847157: java.lang.NullPointerException: HDC for component at sun.java2d.loops.Blit.Blit
   - JDK-7146776: deadlock between URLStreamHandler.getHostAddress and file.Handler.openconnection
+  - JDK-7188942: Remove support of pbuffers in OGL Java2d pipeline
   - JDK-8004148: NPE in sun.awt.SunToolkit.getWindowDeactivationTime
+  - JDK-8022323: [JavaSecurityScanner] review package com.sun.management.* Native methods should be private
   - JDK-8027154: [TESTBUG] Test java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java fails
   - JDK-8035001: TEST_BUG: the retry logic in RMID.start() should check that the subprocess hasn't terminated
   - JDK-8035424: (reflect) Performance problem in sun.reflect.generics.parser.SignatureParser
@@ -23,6 +25,8 @@ Live versions of these release notes can be found at:
   - JDK-8079891: Store configure log in $BUILD/configure.log
   - JDK-8080082: configure fails if you create an empty directory and then run configure from it
   - JDK-8086003: Test fails on OSX with java.lang.RuntimeException 'Narrow klass base: 0x0000000000000000, Narrow klass shift: 3' missing
+  - JDK-8131062: aarch64: add support for GHASH acceleration
+  - JDK-8134869: AARCH64: GHASH intrinsic is not optimal
   - JDK-8134989: java/net/MulticastSocket/TestInterfaces.java failed due to unexpected IP address
   - JDK-8156584: Initialization race in sun.security.x509.AlgorithmId.get
   - JDK-8161016: Strange behavior of URLConnection with proxy
@@ -59,12 +63,15 @@ Live versions of these release notes can be found at:
   - JDK-8268103: JNI functions incorrectly return a double after JDK-8265836
   - JDK-8269594: assert(_handle_mark_nesting > 1) failed: memory leak: allocating handle outside HandleMark
   - JDK-8269810: [8u] Update generated_configure.sh after JDK-8250876 backport
+  - JDK-8269851: OperatingSystemMXBean getProcessCpuLoad reports incorrect process cpu usage in containers
   - JDK-8269859: BacktraceBuilder._cprefs needs to be accessed as unsigned short
   - JDK-8269882: stack-use-after-scope in NewObjectA
   - JDK-8269953: config.log is not in build directory after 8u backport of JDK-8079891
   - JDK-8270137: Kerberos Credential Retrieval from Cache not Working in Cross-Realm Setup
   - JDK-8271466: StackGap test fails on aarch64 due to "-m64"
+  - JDK-8272124: Cgroup v1 initialization causes NullPointerException when cgroup path contains colon
   - JDK-8272214: [8u] Build failure after backport of JDK-8248901
+  - JDK-8272714: [8u] Build failure after backport of JDK-8248901 with MSVC 2013
 
 New in release OpenJDK 8u302 (2021-07-20):
 ===========================================
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index e892137..43a3eef 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -276,7 +276,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-jdk8u312-b04
+%global shenandoah_revision    	aarch64-shenandoah-jdk8u312-b05
 # Define old aarch64/jdk8u tree variables for compatibility
 %global project         %{shenandoah_project}
 %global repo            %{shenandoah_repo}
@@ -2483,6 +2483,11 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Thu Sep 30 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.312.b05-0.1.ea
+- Update to aarch64-shenandoah-jdk8u312-b05 (EA)
+- Update release notes for 8u312-b05.
+- Resolves: rhbz#1999939
+
 * Sun Sep 26 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.312.b04-0.1.ea
 - Update to aarch64-shenandoah-jdk8u312-b04 (EA)
 - Update release notes for 8u312-b04.
diff --git a/sources b/sources
index 36c8460..7c2359c 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-jdk8u312-b04-4curve.tar.xz) = 7553ff5b007150a3361be355e210ae8394926b61aeb1921c67e839710d8a57a639060725b589b7c62ef7b67936239452b438b68e08b38be4c74a3f636f7e9823
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u312-b05-4curve.tar.xz) = 41aa7cfe6946f9b88e8ae66716e8db204a401f5ded43037c54c071b7a895e08df389d6a7ae5961da00c309a6802c88197cd59ed8e5e52a466c997a680f7f425f