diff --git a/.gitignore b/.gitignore
index 61e38c2..a9a764d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/shenandoah8u502-b07.tar.xz
+SOURCES/shenandoah8u504-b01.tar.xz
 SOURCES/tapsets-icedtea-3.15.0.tar.xz
diff --git a/.java-1.8.0-openjdk.metadata b/.java-1.8.0-openjdk.metadata
index cd2d818..9fc5cb1 100644
--- a/.java-1.8.0-openjdk.metadata
+++ b/.java-1.8.0-openjdk.metadata
@@ -1,2 +1,2 @@
-d874ba8e6e76629915b4464267cc07156355b84b SOURCES/shenandoah8u502-b07.tar.xz
+e6dc98449c2b4373860d81e758d4fd764df8bc05 SOURCES/shenandoah8u504-b01.tar.xz
 7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz
diff --git a/SOURCES/NEWS b/SOURCES/NEWS
index aea4751..f4d21f7 100644
--- a/SOURCES/NEWS
+++ b/SOURCES/NEWS
@@ -3,11 +3,36 @@ Key:
 JDK-X  - https://bugs.openjdk.java.net/browse/JDK-X
 CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
+New in release OpenJDK 8u504 (2026-08-18):
+===========================================
+Live versions of these release notes can be found at:
+  * https://bit.ly/openjdk8u504
+
+* CVEs
+* Changes
+  - JDK-8382471: Improve Resource Resolving
+  - JDK-8384708: Enhance HTTP Connections
+  - JDK-8385390: Update FreeType to 2.14.3
+  - JDK-8386205: Enhance TLS server
+  - JDK-8388811: [8u] VS2010 build broken by JDK-8374058
+  - JDK-8389477: Bump update version for OpenJDK: 8u504
+
 New in release OpenJDK 8u502 (2026-07-21):
 ===========================================
 Live versions of these release notes can be found at:
   * https://bit.ly/openjdk8u502
 
+* CVEs
+  - CVE-2026-46968
+  - CVE-2026-47010
+  - CVE-2026-47021
+  - CVE-2026-47027
+  - CVE-2026-60147
+  - CVE-2026-47059
+  - CVE-2026-47063
+  - CVE-2026-47057
+  - CVE-2026-47058
+  - CVE-2026-41254
 * Changes
   - JDK-6815126: intermittent SimulResumerTest.java failure
   - JDK-8162545: Mac build failure
diff --git a/SOURCES/java-1.8.0-openjdk-portable.specfile b/SOURCES/java-1.8.0-openjdk-portable.specfile
index 47741bc..1ab27de 100644
--- a/SOURCES/java-1.8.0-openjdk-portable.specfile
+++ b/SOURCES/java-1.8.0-openjdk-portable.specfile
@@ -3,7 +3,7 @@
 # Define version of OpenJDK 8 used
 %global project openjdk
 %global repo shenandoah-jdk8u
-%global openjdk_revision 8u502-b07
+%global openjdk_revision 8u504-b01
 %global shenandoah_revision shenandoah%{openjdk_revision}
 # e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04
 %global version_tag     %(VERSION=%{shenandoah_revision}; echo ${VERSION%%-shenandoah-merge*})
@@ -679,7 +679,7 @@ BuildRequires: libpng-devel
 BuildRequires: zlib-devel
 %else
 # Version in jdk/src/share/native/sun/awt/libfreetype/include/freetype/freetype.h
-Provides: bundled(freetype) = 2.14.2
+Provides: bundled(freetype) = 2.14.3
 # Version in jdk/src/share/native/sun/awt/giflib/gif_lib.h
 Provides: bundled(giflib) = 6.1.2
 # Version in jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h
@@ -1538,6 +1538,17 @@ done
 %endif
 
 %changelog
+* Mon Aug 10 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.504.b01-1.0
+- Update to 8u504-b01 (GA).
+- Update release notes for 8u504-b01.
+- Bump FreeType version to 2.14.3 following JDK-8385390
+- ** This tarball is embargoed until 2026-08-18 @ 1pm PT. **
+- Resolves: OPENJDK-5034
+
+* Mon Jul 27 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.502.b07-2.0
+- Add CVEs to NEWS file
+- Related: OPENJDK-4869
+
 * Fri Jul 17 2026 Andrea Bolognani <abologna@redhat.com> - 1:1.8.0.502.b07-1.0
 - Strip %%{dist} more thoroughly
 - Resolves: OPENJDK-4907
diff --git a/SPECS/java-1.8.0-openjdk.spec b/SPECS/java-1.8.0-openjdk.spec
index 2778d0b..98bfec2 100644
--- a/SPECS/java-1.8.0-openjdk.spec
+++ b/SPECS/java-1.8.0-openjdk.spec
@@ -8,7 +8,7 @@
 # Define version of OpenJDK 8 used
 %global project openjdk
 %global repo shenandoah-jdk8u
-%global openjdk_revision 8u502-b07
+%global openjdk_revision 8u504-b01
 %global shenandoah_revision shenandoah%{openjdk_revision}
 # e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04
 %global version_tag     %(VERSION=%{shenandoah_revision}; echo ${VERSION%%-shenandoah-merge*})
@@ -1624,7 +1624,7 @@ BuildRequires: libpng-devel
 BuildRequires: zlib-devel
 %else
 # Version in jdk/src/share/native/sun/awt/libfreetype/include/freetype/freetype.h
-Provides: bundled(freetype) = 2.14.2
+Provides: bundled(freetype) = 2.14.3
 # Version in jdk/src/share/native/sun/awt/giflib/gif_lib.h
 Provides: bundled(giflib) = 6.1.2
 # Version in jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h
@@ -2715,6 +2715,18 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Mon Aug 10 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.504.b01-1.1
+- Update to 8u504-b01 (GA).
+- Update release notes for 8u504-b01.
+- Bump FreeType version to 2.14.3 following JDK-8385390
+- Sync the copy of the portable specfile with the latest update
+- ** This tarball is embargoed until 2026-08-18 @ 1pm PT. **
+- Resolves: RHEL-235605
+
+* Mon Jul 27 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.502.b07-2.1
+- Add CVEs to NEWS file
+- Related: RHEL-188874
+
 * Fri Jul 17 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.502.b07-1.1
 - Update to 8u502-b07 (GA).
 - Update release notes for 8u502-b07.