diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 6d14fb0..756beb1 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -131,9 +131,9 @@
 # Set of architectures which support multiple ABIs
 %global multilib_arches %{power64} sparc64 x86_64
 # Set of architectures for which we build slowdebug builds
-%global debug_arches    %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x
+%global debug_arches    %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x riscv64
 # Set of architectures for which we build fastdebug builds
-%global fastdebug_arches x86_64 ppc64le aarch64
+%global fastdebug_arches x86_64 ppc64le aarch64 riscv64
 # Set of architectures with a Just-In-Time (JIT) compiler
 %global jit_arches      %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 riscv64
 # Set of architectures which use the Zero assembler port (!jit_arches)
@@ -155,9 +155,9 @@
 # Set of architectures for which we build the Z garbage collector
 %global zgc_arches x86_64 riscv64
 # Set of architectures for which alt-java has SSB mitigation
-%global ssbd_arches x86_64
+%global ssbd_arches x86_64 riscv64
 # Set of architectures for which java has short vector math library (libsvml.so)
-%global svml_arches x86_64
+%global svml_arches x86_64 riscv64
 # Set of architectures where we verify backtraces with gdb
 # s390x fails on RHEL 7 so we exclude it there
 %if (0%{?rhel} > 0 && 0%{?rhel} < 8)
@@ -565,7 +565,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
@@ -1631,6 +1631,10 @@ done
 %license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
 
 %changelog
+* Fri Mar 08 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1:20.0.2.0.9-1.rolling.1.riscv64
+- Enable more options for riscv64:
+-  debug, fastdebug, ssbd, svml
+
 * Fri Mar 08 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1:20.0.2.0.9-1.rolling.0.riscv64
 - Rebuild for riscv64