diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index e61b31dbf8f8d3868c0d60fc8bc5e01492e11796..3f61fdbf2bbcf14e7bfd4b24dd1122380ea7236e 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -152,7 +152,7 @@
 # Used via new version scheme. JDK 16 was
 # GA'ed in March 2021 => 21.3
 %global vendor_version_string 21.3
-%global securityver 0
+%global securityver 1
 # 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
@@ -167,8 +167,8 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        36
-%global rpmrelease      1
+%global buildver        9
+%global rpmrelease      0
 # 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
 %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@@ -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-jdk%{majorver}-jdk-%{majorver}+%{buildver}.tar.gz
+Source0: jdk-updates-jdk%{majorver}u-jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}.tar.gz
 Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
 
 # Desktop files. Adapted from IcedTea
@@ -1530,7 +1530,7 @@ if ! echo $suffix | grep -q "debug" ; then
   # Install Javadoc documentation
   install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
   cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
-  cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
+  cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}.%{minorver}.%{securityver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
 fi
 
 # Install icons and menu entries
@@ -1739,6 +1739,9 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Tue May 18 2021 noah <hedongbo@huawei.com> - 1:16.0.1.9-0.rolling
+- Update to jdk-16.0.1+9
+
 * Mon May 17 2021 noah <hedongbo@huawei.com> - 1:16.0.0.36-1.rolling
 - Bumped buildjdkver to build by itself - 16
 
diff --git a/jdk-jdk16-jdk-16+36.tar.gz b/jdk-updates-jdk16u-jdk-16.0.1+9.tar.gz
similarity index 85%
rename from jdk-jdk16-jdk-16+36.tar.gz
rename to jdk-updates-jdk16u-jdk-16.0.1+9.tar.gz
index 196d24d6ab25490490bca26e0e32bdc4cec983a2..3d71610244ea64848db5bd0a5b08d3b059faa1ef 100644
Binary files a/jdk-jdk16-jdk-16+36.tar.gz and b/jdk-updates-jdk16u-jdk-16.0.1+9.tar.gz differ
diff --git a/sources b/sources
index c53fb1b8e411d31012c1a6bcb482943f11ab1faf..c0f70cfb0762c983d737c1513dfd69dbedcbacb1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jdk-updates-jdk14u-jdk-14.0.2+12.tar.xz) = cbd05728395d09b4d69ecfee6eb737262d199e0bbc8ad047c1912cbb23dd2434753f2a7070a9a71aa6cd8e09ff0badd8a25c9e1ec512936ffd234e530baae357
-SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
+SHA512 (jdk-updates-jdk16u-jdk-16.0.1+9.tar.gz) = af49ec97557bb40b09fc5a04a4295b3f5c2c51848b398ed400630c9f3628a9c9e674c67e7394c1dd35093d910a0e1cb76af3a279c57d507c6327ec90ccd78072
+SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = 9f5bbc1a6bf2ee44e4f846b0ef9c1cd93dc9cf01b17b17f31f081229c98222ee92897286a3d57e4b607de1ea4c6edc8d798e0887409ad60713b714daa8f4ee18