diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index e9a28d8..7b85680 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -113,7 +113,7 @@
 # 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
 # Set of architectures with a Just-In-Time (JIT) compiler
@@ -1192,7 +1192,7 @@ ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 riscv64
 
 Name:    java-%{javaver}-%{origin}
 Version: %{newjavaver}.%{buildver}
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.alma.1
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.alma.2
 # Equivalent for the portable build
 %global prelease %{?eaprefix}%{portablerelease}%{?extraver}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
@@ -2480,8 +2480,9 @@ exit 0
 %endif
 
 %changelog
-* Fri Feb 20 2026 Eduard Abdullin <eabdullin@almalinux.org> - 1:21.0.10.0.7-2.alma.1
-- Use el8 portable packages
+* Sun Feb 22 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 1:21.0.10.0.7-2.alma.2
+- Use el8 portable packages, el10 for riscv64
+- Add riscv64 to debug_arches
 
 * Wed Feb 18 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.10.0.7-2
 - Bump rpmrelease for CentOS build