diff --git a/jq.spec b/jq.spec
index 055cf58..f9fb0c1 100644
--- a/jq.spec
+++ b/jq.spec
@@ -1,6 +1,6 @@
 Name:           jq
 Version:        1.6
-Release:        5%{?dist}
+Release:        5.0.riscv64%{?dist}
 Summary:        Command-line JSON processor
 
 License:        MIT and ASL 2.0 and CC-BY and GPLv3
@@ -12,7 +12,7 @@ BuildRequires:  flex
 BuildRequires:  bison
 BuildRequires:  oniguruma-devel
 
-%ifnarch s390
+%ifnarch %{valgrind_arches}
 BuildRequires:  valgrind
 %endif
 
@@ -67,7 +67,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %check
 # Valgrind used, so restrict architectures for check
-%ifarch %{ix86} x86_64
+%ifarch %{valgrind_arches}
 make check
 %endif
 
@@ -89,6 +89,9 @@ make check
 
 
 %changelog
+* Wed May 05 2021 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1.6-5.0.riscv64
+- Use %%{valgrind_arches}
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild