diff --git a/java-25-openjdk-portable.specfile b/java-25-openjdk-portable.specfile
index 4b555a8..6eb9bfa 100644
--- a/java-25-openjdk-portable.specfile
+++ b/java-25-openjdk-portable.specfile
@@ -1,10 +1,10 @@
 # New Version-String scheme-style defines
 %global featurever 25
 %global interimver 0
-%global updatever 3
+%global updatever 4
 %global patchver 0
-%global buildver 9
-%global portablerelease 3
+%global buildver 7
+%global portablerelease 1
 %global rpmrelease 0
 
 # Define IcedTea version used for SystemTap tapsets and desktop file
@@ -613,8 +613,6 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
 #
 #############################################
 
-# JDK-8375294: (fs) Files.copy can fail with EOPNOTSUPP when copy_file_range not supported
-Patch2001: jdk8375294-handle-EOPNOTSUPP-in-copying.patch
 # JDK-8347901: C2 should remove unused leaf / pure runtime calls
 Patch2002: jdk8347901-c2_unused_leaf_removal.patch
 # JDK-83787313: C2: performance regression due to missing constant folding for Math.pow()
@@ -701,17 +699,17 @@ BuildRequires: libpng-devel
 BuildRequires: zlib-devel
 %else
 # Version in src/java.desktop/share/legal/freetype.md
-Provides: bundled(freetype) = 2.14.2
+Provides: bundled(freetype) = 2.14.3
 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
-Provides: bundled(giflib) = 6.1.2
+Provides: bundled(giflib) = 6.1.3
 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
-Provides: bundled(harfbuzz) = 12.3.2
+Provides: bundled(harfbuzz) = 14.2.0
 # Version in src/java.desktop/share/native/liblcms/lcms2.h
-Provides: bundled(lcms2) = 2.17.0
+Provides: bundled(lcms2) = 2.19.1
 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
 Provides: bundled(libjpeg) = 6b
 # Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
-Provides: bundled(libpng) = 1.6.57
+Provides: bundled(libpng) = 1.6.58
 # Version in src/java.base/share/native/libzip/zlib/zlib.h
 Provides: bundled(zlib) = 1.3.2
 # We link statically against libstdc++ to increase portability
@@ -915,8 +913,6 @@ sh %{SOURCE12} %{top_level_dir_name}
 pushd %{top_level_dir_name}
 # Add crypto policy and FIPS support
 %patch -P1001 -p1
-# Add EOPNOTSUPP patch
-%patch -P2001 -p1
 # Add C2 patches
 %patch -P2002 -p1
 %patch -P2003 -p1
@@ -1632,10 +1628,7 @@ $JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -versi
   # Check translations are available for new timezones (during flatpak builds, the
   # tzdb.dat used by this test is not where the test expects it, so this is
   # disabled for flatpak builds)
-  # Disable test until we are on the latest JDK
-  $JAVA_HOME/bin/javac -d . %{SOURCE18}
-  $JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
-  $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
+  $JAVA_HOME/bin/java %{SOURCE18}
 %endif
 
   # Check blocked.certs is valid (OPENJDK-4362)
@@ -1886,6 +1879,22 @@ done
 %endif
 
 %changelog
+* Thu Jul 16 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.4.0.7-1.0
+- Update to jdk-25.0.4+7 (GA)
+- Update release notes to 25.0.4+7
+- Bump freetype version to 2.14.3 following JDK-8385390
+- Bump giflib version to 6.1.3 following JDK-8384902
+- Bump HarfBuzz version to 14.2.0 following JDK-8385490
+- Bump lcms2 version to 2.19.1 following JDK-8375065 & JDK-8383354
+- Bump libpng version to 1.6.58 following JDK-8384495
+- Drop local copy of JDK-8375294 EOPNOTSUPP patch
+- Revert fr_FR and de_DE changes made in d43f0e6186370fdeb0ca2f3594f39783e20eef1c now JDK-8382020 is fixed
+- Simplify TestTranslations run now there is only the CLDR provider and one set of data (JDK-8174269)
+- Make zone string debug output optional in TestTranslations
+- ** This tarball is embargoed until 2026-07-21 @ 1pm PT. **
+- Resolves: OPENJDK-4865
+- Resolves: OPENJDK-4902
+
 * Mon Jul 13 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.3.0.9-3.0
 - Add 25u backports of JDK-8347901 & JDK-8378713 C2 performance fixes
 - Resolves: OPENJDK-4885
diff --git a/java-25-openjdk.spec b/java-25-openjdk.spec
index 9e27bb8..29ba2a3 100644
--- a/java-25-openjdk.spec
+++ b/java-25-openjdk.spec
@@ -2609,6 +2609,7 @@ exit 0
 - Revert fr_FR and de_DE changes made in d43f0e6186370fdeb0ca2f3594f39783e20eef1c now JDK-8382020 is fixed
 - Simplify TestTranslations run now there is only the CLDR provider and one set of data (JDK-8174269)
 - Make zone string debug output optional in TestTranslations
+- Sync the copy of the portable specfile with the latest update
 - ** This tarball is embargoed until 2026-07-21 @ 1pm PT. **
 - Resolves: RHEL-188883
 - Resolves: RHEL-212294
@@ -2625,6 +2626,7 @@ exit 0
 - * scripts/builds/waive_usual_tier0.sh: Remove redundant 'test "x"' usage.
 - Remove macro references in comments where possible (%dnl not compatible enough yet)
 - Move version information and core NVR definitions back towards the top of the file
+- Specify portablerelease and rpmrelease (always 0 for portables) in the Release field
 - Add 25u backports of JDK-8347901 & JDK-8378713 C2 performance fixes
 - Sync the copy of the portable specfile with the latest update
 - Related: RHEL-155327