diff --git a/.gitignore b/.gitignore
index 2d2a4bb..3931ffb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/openjdk-17.0.20+8.tar.xz
+SOURCES/openjdk-17.0.20.1+1.tar.xz
 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
diff --git a/.java-17-openjdk.metadata b/.java-17-openjdk.metadata
index d4a9eb8..904c09c 100644
--- a/.java-17-openjdk.metadata
+++ b/.java-17-openjdk.metadata
@@ -1,2 +1,2 @@
-8906f5fdea5099759f671aed6c5becbb20b8df39 SOURCES/openjdk-17.0.20+8.tar.xz
+0fec7e7f5084dbd870a35708781ad48df3f735b9 SOURCES/openjdk-17.0.20.1+1.tar.xz
 c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
diff --git a/SOURCES/NEWS b/SOURCES/NEWS
index 257b6ba..9654e4a 100644
--- a/SOURCES/NEWS
+++ b/SOURCES/NEWS
@@ -3,6 +3,19 @@ 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 17.0.20.1 (2026-08-18):
+==============================================
+Live versions of these release notes can be found at:
+  * https://bit.ly/openjdk170201
+
+* Changes
+  - JDK-8333743: Change .jcheck/conf branches property to match valid branches
+  - JDK-8382471: Improve Resource Resolving
+  - JDK-8384708: Enhance HTTP Connections
+  - JDK-8386205: Enhance TLS server
+  - JDK-8388790: Bump update version for OpenJDK: jdk-17.0.20.1
+  - JDK-8389947: [17u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 17.0.20.1
+
 New in release OpenJDK 17.0.20 (2026-07-21):
 ============================================
 Live versions of these release notes can be found at:
diff --git a/SOURCES/java-17-openjdk-portable.specfile b/SOURCES/java-17-openjdk-portable.specfile
index 9978a1d..9a4739b 100644
--- a/SOURCES/java-17-openjdk-portable.specfile
+++ b/SOURCES/java-17-openjdk-portable.specfile
@@ -316,7 +316,7 @@
 %global featurever 17
 %global interimver 0
 %global updatever 20
-%global patchver 0
+%global patchver 1
 # buildjdkver is usually same as %%{featurever},
 # but in time of bootstrap of next jdk, it is featurever-1,
 # and this it is better to change it here, on single place
@@ -379,7 +379,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{vcstag}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 8
+%global buildver 1
 %global portablerelease 1
 %global rpmrelease 0
 #%%global tagsuffix     %%{nil}
@@ -1826,6 +1826,23 @@ done
 %endif
 
 %changelog
+* Fri Aug 07 2026 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.20.1.1-1.0
+- Update to jdk-17.0.20.1+1 (GA)
+- Add to .gitignore openjdk-17.0.20.1+1.tar.xz
+- Set buildver to 1
+- Set is_ga to 1
+- Update sources to openjdk-17.0.20.1+1.tar.xz
+- ** This tarball is embargoed until 2026-08-18 @ 1pm PT. **
+- Update NEWS for jdk-17.0.20.1+1 (GA)
+
+* Thu Aug 06 2026 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.20.1.0-0.1.0.ea
+- Update to jdk-17.0.20.1+0 (EA)
+- Add to .gitignore openjdk-17.0.20.1+0.tar.xz
+- Set patchver to 1
+- Set buildver to 0
+- Set is_ga to 0
+- Update sources to openjdk-17.0.20.1+0.tar.xz
+
 * Mon Jul 13 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.20.0.8-1.0
 - Update NEWS for jdk-17.0.20+8 (GA)
 
diff --git a/SPECS/java-17-openjdk.spec b/SPECS/java-17-openjdk.spec
index eb6d2b9..d4a6da8 100644
--- a/SPECS/java-17-openjdk.spec
+++ b/SPECS/java-17-openjdk.spec
@@ -325,7 +325,7 @@
 %global featurever 17
 %global interimver 0
 %global updatever 20
-%global patchver 0
+%global patchver 1
 # buildjdkver is usually same as %%{featurever},
 # but in time of bootstrap of next jdk, it is featurever-1,
 # and this it is better to change it here, on single place
@@ -379,7 +379,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{vcstag}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 8
+%global buildver 1
 %global rpmrelease 1
 # Settings used by the portable build
 %global portablerelease 1
@@ -2487,6 +2487,17 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Fri Aug 07 2026 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.20.1.1-1.1
+- Update to jdk-17.0.20.1+1 (GA)
+- Add to .gitignore openjdk-17.0.20.1+1.tar.xz
+- Set patchver to 1
+- Set buildver to 1
+- Update sources to openjdk-17.0.20.1+1.tar.xz
+- ** This tarball is embargoed until 2026-08-18 @ 1pm PT. **
+- Resolves: RHEL-235606
+- Update NEWS for jdk-17.0.20.1+1 (GA)
+- Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8
+
 * Mon Jul 13 2026 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.20.0.8-1.1
 - Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8
 - Add .0 to prelease