diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index aea7ad5..567b1a7 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -286,7 +286,7 @@
 # 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
-%global buildjdkver 16
+%global buildjdkver 11
 # 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 ""
@@ -1086,7 +1086,7 @@ Version: %{newjavaver}.%{buildver}
 # This package needs `.rolling` as part of Release so as to not conflict on install with
 # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
 # java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling.1.riscv64%{?dist}
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling.2.riscv64%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
 # also included the epoch in their virtual provides. This created a
@@ -2242,6 +2242,9 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Mon May 24 2021 David Abdurachmanov <david.abdurachmanov@gmail.com> -  1:16.0.1.0.9-2.rolling.2.riscv64
+- Set buildjdkver to 11
+
 * Mon May 24 2021 David Abdurachmanov <david.abdurachmanov@gmail.com> -  1:16.0.1.0.9-2.rolling.1.riscv64
 - Ignore GDB check for riscv64
 - Use OpenJDK 11 to bootstrap