diff --git a/jdk-updates-jdk16u-jdk-16.0.2+7.tar.gz b/jdk-jdk17-jdk-17+35.tar.gz
similarity index 97%
rename from jdk-updates-jdk16u-jdk-16.0.2+7.tar.gz
rename to jdk-jdk17-jdk-17+35.tar.gz
index f600b3baa74f0316f584f151657a33dbb511f192..5d6d0442fc273017e80c2b07e1dbb16b6359103f 100644
Binary files a/jdk-updates-jdk16u-jdk-16.0.2+7.tar.gz and b/jdk-jdk17-jdk-17+35.tar.gz differ
diff --git a/openjdk-latest.spec b/openjdk-latest.spec
index 091d0a6f0fa17b1be694ad8b6830c7f87c817562..39c898307fc7380b43bcca91c37268e7f00f7dfb 100644
--- a/openjdk-latest.spec
+++ b/openjdk-latest.spec
@@ -148,15 +148,15 @@
 
 # New Version-String scheme-style defines
 # If you bump majorver, you must bump also vendor_version_string
-%global majorver 16
-# Used via new version scheme. JDK 16 was
-# GA'ed in March 2021 => 21.3
-%global vendor_version_string 21.3
-%global securityver 2
+%global majorver 17
+# Used via new version scheme. JDK 17 was
+# GA'ed in March 2021 => 21.9
+%global vendor_version_string 21.9
+%global securityver 0
 # buildjdkver is usually same as %%{majorver},
 # but in time of bootstrap of next jdk, it is majorver-1, 
 # and this it is better to change it here, on single place
-%global buildjdkver 16
+%global buildjdkver 35
 # We don't add any LTS designator for STS packages (this package).
 # Neither for Fedora nor EPEL which would have %%{rhel} macro defined.
  %global lts_designator ""
@@ -923,7 +923,7 @@ URL:      http://openjdk.java.net/
 
 # to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
 # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source0: jdk-updates-jdk%{majorver}u-jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}.tar.gz
+Source0: jdk-jdk%{majorver}u-jdk-%{majorver}+%{buildver}.tar.gz
 Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
 
 # Desktop files. Adapted from IcedTea