diff --git a/libdap.spec b/libdap.spec
index a6c0a45..ffb88af 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -1,7 +1,7 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
 Version: 3.18.3
-Release: 5%{?dist}
+Release: 5.0.riscv64%{?dist}
 
 License: LGPLv2+
 Group: Development/Libraries
@@ -22,7 +22,7 @@ BuildRequires: libuuid-devel
 BuildRequires: libxml2-devel
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
-%ifnarch s390 %{mips}
+%ifarch %{valgrind_arches}
 BuildRequires: valgrind
 %endif
 
@@ -131,6 +131,9 @@ make check
 
 
 %changelog
+* Tue Jun 05 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 3.18.3-5.0.riscv64
+- Switch to use %{valgrind_arches}
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild