diff --git a/openmpi.spec b/openmpi.spec
index 5c01d21..802c432 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -64,7 +64,7 @@
 
 Name:           openmpi%{?_cc_name_suffix}
 Version:        5.0.0
-Release:        2%{?dist}
+Release:        2.0.riscv64%{?dist}
 Summary:        Open Message Passing Interface
 License:        BSD and MIT and Romio
 URL:            http://www.open-mpi.org/
@@ -85,7 +85,9 @@ BuildRequires:  libtool
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(File::Find)
 %endif
+%ifarch %{valgrind_arches}
 BuildRequires:  valgrind-devel
+%endif
 %if %{with rdma}
 BuildRequires:  opensm-devel > 3.3.0
 BuildRequires:  rdma-core-devel
@@ -257,8 +259,10 @@ OpenMPI support for Python 3.
 %endif
 	--with-prrte=external \
 	--with-sge \
+%ifarch %{valgrind_arches}
 	--with-valgrind \
 	--enable-memchecker \
+%endif
 	--with-hwloc=/usr \
 %if !0%{?el7}
 	--with-libevent=external \
@@ -449,6 +453,9 @@ make check || ( cat test/*/test-suite.log && exit $fail )
 
 
 %changelog
+* Mon Nov 06 2023 David Abdurachmanov <davidlt@rivosinc.com> - 5.0.0-2.0.riscv64
+- Add support for riscv64
+
 * Tue Oct 31 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 5.0.0-2
 - Disable building docs in RHEL builds