diff --git a/java-21-openjdk-portable.specfile b/java-21-openjdk-portable.specfile
index 6b5bc4b..79a78be 100644
--- a/java-21-openjdk-portable.specfile
+++ b/java-21-openjdk-portable.specfile
@@ -390,7 +390,7 @@
 %global top_level_dir_name   %{vcstag}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        6
-%global rpmrelease      1
+%global rpmrelease      2
 #%%global tagsuffix     %%{nil}
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
@@ -673,7 +673,9 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
 #
 #############################################
 
-# Currently empty
+# JDK-8351500: G1: NUMA migrations cause crashes in region allocation
+# Upstream in 21.0.8+1
+Patch2001: jdk8351500-numa_migration_crashes.patch
 
 #############################################
 #
@@ -986,6 +988,8 @@ sh %{SOURCE12} %{top_level_dir_name}
 pushd %{top_level_dir_name}
 # Add crypto policy and FIPS support
 %patch -P1001 -p1
+# Add early JDK-8351500
+%patch -P2001 -p1
 popd # openjdk
 
 
@@ -1935,6 +1939,10 @@ done
 %endif
 
 %changelog
+* Thu May 08 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.7.0.6-2
+- Add local version of JDK-8351500 for early interim release before 21.0.8
+- Resolves: OPENJDK-3679
+
 * Fri Apr 11 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.7.0.6-1
 - Update to jdk-21.0.7+6 (GA)
 - Update release notes to 21.0.7+6
diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index dcad51d..54dbdc6 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -2568,6 +2568,7 @@ require "copy_jdk_configs.lua"
 %changelog
 * Thu May 08 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.7.0.6-2
 - Add local version of JDK-8351500 for early interim release before 21.0.8
+- Sync the copy of the portable specfile with the latest update
 - Resolves: RHEL-90306
 
 * Fri Apr 11 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.7.0.6-1