diff --git a/hyphen.spec b/hyphen.spec
index d4abef9..185a46a 100644
--- a/hyphen.spec
+++ b/hyphen.spec
@@ -1,16 +1,12 @@
 Name:      hyphen
 Summary:   A text hyphenation library
 Version:   2.8.8
-Release:   18%{?dist}
+Release:   18.0.riscv64%{?dist}
 Source:    http://downloads.sourceforge.net/hunspell/hyphen-%{version}.tar.gz
 URL:       http://hunspell.sf.net
 License:   GPLv2 or LGPLv2+ or MPLv1.1
 BuildRequires: perl-interpreter, patch, autoconf, automake, libtool
-# s390 lacks valgrind support
-# no working valgrind built for MIPS yet
-# tests with valgrind fail on arm
-# tests with valgrind fail on ppc64le
-%ifnarch s390 %{arm} %{mips} ppc64le
+%ifarch %{valgrind_arches}
 BuildRequires: valgrind
 %endif
 BuildRequires: make
@@ -42,7 +38,7 @@ make %{?_smp_mflags}
 
 %check
 make check
-%ifnarch s390 %{arm} %{mips} ppc64le
+%ifarch %{valgrind_arches}
 VALGRIND=memcheck make check
 %endif
 
@@ -75,6 +71,9 @@ popd
 %{_bindir}/substrings.pl
 
 %changelog
+* Wed Oct 19 2022 David Abdurachmanov <davidlt@rivosinc.com> - 2.8.8-18.0.riscv64
+- Properly check valgrind arches
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.8-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild