diff --git a/.gitignore b/.gitignore
index da2aef1..1f95540 100644
--- a/.gitignore
+++ b/.gitignore
@@ -256,3 +256,4 @@
 /openjdk-shenandoah-jdk8u-shenandoah-jdk8u332-b06-4curve.tar.xz
 /openjdk-shenandoah-jdk8u-shenandoah-jdk8u332-b09-4curve.tar.xz
 /openjdk-shenandoah-jdk8u-shenandoah-jdk8u342-b06-4curve.tar.xz
+/openjdk-shenandoah-jdk8u-shenandoah-jdk8u342-b07-4curve.tar.xz
diff --git a/NEWS b/NEWS
index 883a62c..a826722 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,15 @@ Live versions of these release notes can be found at:
   * https://bitly.com/openjdk8u342
   * https://builds.shipilev.net/backports-monitor/release-notes-openjdk8u342.txt
 
+* Security fixes
+  - JDK-8272243: Improve DER parsing
+  - JDK-8272249: Better properties of loaded Properties
+  - JDK-8277608: Address IP Addressing
+  - JDK-8281859, CVE-2022-21540: Improve class compilation
+  - JDK-8281866, CVE-2022-21541: Enhance MethodHandle invocations
+  - JDK-8283190: Improve MIDI processing
+  - JDK-8284370: Improve zlib usage
+  - JDK-8285407, CVE-2022-34169: Improve Xalan supports
 * Other changes
   - JDK-8031567: Better model for storing source revision information
   - JDK-8076190: Customizing the generation of a PKCS12 keystore
@@ -21,6 +30,7 @@ Live versions of these release notes can be found at:
   - JDK-8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a negative initial size for ByteArrayOutputStream
   - JDK-8194154: System property user.dir should not be changed
   - JDK-8202142: jfr/event/io/TestInstrumentation is unstable
+  - JDK-8209771: jdk.test.lib.Utils::runAndCheckException error
   - JDK-8221988: add possibility to build with Visual Studio 2019
   - JDK-8223396: [TESTBUG] several jfr tests do not clean up files created in /tmp
   - JDK-8230865: [TESTBUG] jdk/jfr/event/io/EvilInstrument.java fails at-run shell MakeJAR.sh target
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index a301a7c..486f3ac 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -335,7 +335,7 @@
 # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
 %global shenandoah_project      openjdk
 %global shenandoah_repo         shenandoah-jdk8u
-%global openjdk_revision        jdk8u342-b06
+%global openjdk_revision        jdk8u342-b07
 %global shenandoah_revision     shenandoah-%{openjdk_revision}
 # Define old aarch64/jdk8u tree variables for compatibility
 %global project         %{shenandoah_project}
@@ -351,12 +351,12 @@
 %global updatever       %(VERSION=%{whole_update}; echo ${VERSION##*u})
 # eg jdk8u60-b27 -> b27
 %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease      4
+%global rpmrelease      1
 # 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,
 # - N%%{?extraver}{?dist} for GA releases
-%global is_ga           0
+%global is_ga           1
 %if %{is_ga}
 %global milestone          fcs
 %global milestone_version  %{nil}
@@ -451,7 +451,11 @@
 %endif
 
 # x86 is no longer supported
+%if 0%{?java_arches:1}
 ExclusiveArch:  %{java_arches}
+%else
+ExcludeArch: %{ix86}
+%endif
 
 # not-duplicated scriptlets for normal/debug packages
 %global update_desktop_icons /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -2828,6 +2832,12 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Sun Jul 24 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.342.b07-1
+- Update to shenandoah-jdk8u342-b07 (GA)
+- Update release notes for 8u342-b07.
+- Switch to GA mode for final release.
+- Exclude x86 where java_arches is undefined, in order to unbreak build
+
 * Fri Jul 22 2022 Jiri Vanek <gnu.andrew@redhat.com> - 1:1.8.0.342.b06-0.4.ea
 - moved to build only on %%{java_arches}
 -- https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
@@ -2843,6 +2853,9 @@ cjc.mainProgram(args)
 -- this is safely backport-able to older fedoras, as the macro was  backported proeprly (with i686 included)
 - https://bugzilla.redhat.com/show_bug.cgi?id=2104129
 
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.0.342.b06-0.3.ea.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Tue Jul 19 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.342.b06-0.3.ea
 - Reinstate demo package on x86
 
diff --git a/sources b/sources
index 8c41d22..06bd55f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (openjdk-shenandoah-jdk8u-shenandoah-jdk8u342-b06-4curve.tar.xz) = bc7fb9c21f33b2edab948b2b31e3198441c7901369476cd4d4ba0056dbba394a0a19099a2d57987641575f17383a4fd2b85a791ee56fbe2deaa246ec89fe9d81
+SHA512 (openjdk-shenandoah-jdk8u-shenandoah-jdk8u342-b07-4curve.tar.xz) = 64b467edeb332062fd3e1c0647dc2e75616fdaf8a629922d017a49e89324c19eb762d03a951399891fa08db188fc3dee8c7f34351b415e6121c0a51520043ea1