diff --git a/rdma-core.spec b/rdma-core.spec
index 01f87b3..a424dbe 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -1,6 +1,6 @@
 Name: rdma-core
 Version: 44.0
-Release: %autorelease
+Release: %autorelease -e 0.riscv64
 Summary: RDMA core userspace libraries and daemons
 
 # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
@@ -30,7 +30,9 @@ BuildRequires: pkgconfig
 BuildRequires: pkgconfig(libnl-3.0)
 BuildRequires: pkgconfig(libnl-route-3.0)
 BuildRequires: /usr/bin/rst2man
+%ifarch %{valgrind_arches}
 BuildRequires: valgrind-devel
+%endif
 BuildRequires: systemd
 BuildRequires: systemd-devel
 %if 0%{?fedora} >= 32 || 0%{?rhel} >= 8
@@ -88,8 +90,10 @@ BuildRequires: make
 
 %if 0%{?fedora} >= 25 || 0%{?rhel} == 8
 # pandoc was introduced in FC25, Centos8
+%ifnarch riscv64
 BuildRequires: pandoc
 %endif
+%endif
 
 %if 0%{?fedora} >= 34
 # self obsoletes to remove i686 multilib package when updating to F34