diff --git a/mpich.spec b/mpich.spec
index 64f58d2..8599b8f 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -1,7 +1,7 @@
 Summary:        A high-performance implementation of MPI
 Name:           mpich
 Version:        4.0.3
-Release:        %autorelease
+Release:        %autorelease -e 0.riscv64
 License:        MIT
 URL:            https://www.mpich.org/
 
@@ -35,7 +35,7 @@ BuildRequires:  ucx-devel
 %endif
 # For ./maint/extractcvars
 BuildRequires:  perl(lib)
-%ifnarch s390 %{mips}
+%ifarch %{valgrind_arches}
 BuildRequires:  valgrind-devel
 %endif
 # For %%{python3_sitearch}