diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 975db87..2f4bcf9 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -128,7 +128,7 @@
 # Set of architectures with a Ahead-Of-Time (AOT) compiler
 %global aot_arches      x86_64 %{aarch64}
 # Set of architectures which support the serviceability agent
-%global sa_arches       %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
+%global sa_arches       %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} riscv64
 # Set of architectures which support class data sharing
 # See https://bugzilla.redhat.com/show_bug.cgi?id=513605
 # MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT
@@ -1307,7 +1307,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.0.riscv64%{?dist}
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling.1.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
@@ -2685,6 +2685,9 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Sat Sep 17 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1:19.0.0.0.36-2.rolling.1.riscv64
+- Add riscv64 to sa_arches
+
 * Fri Sep 16 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1:19.0.0.0.36-2.rolling.0.riscv64
 - Try to build (bootstrap)