diff --git a/hyphen.spec b/hyphen.spec
index 56887da..c8ff728 100644
--- a/hyphen.spec
+++ b/hyphen.spec
@@ -1,14 +1,16 @@
 Name:      hyphen
 Summary:   A text hyphenation library
 Version:   2.8.8
-Release:   2%{?dist}
+Release:   3%{?dist}
 Source:    http://downloads.sourceforge.net/hunspell/hyphen-%{version}.tar.gz
 Group:     System Environment/Libraries
 URL:       http://hunspell.sf.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:   GPLv2 or LGPLv2+ or MPLv1.1
 BuildRequires: perl, patch, autoconf, automake, libtool
-%ifarch %{ix86} x86_64
+# s390 lacks valgrind support
+# tests with valgrind fail on arm
+%ifnarch s390 %{arm}
 BuildRequires: valgrind
 %endif
 
@@ -40,11 +42,9 @@ English hyphenation rules.
 make %{?_smp_mflags}
 
 %check
-#%ifarch %{ix86} x86_64, see rhbz#813780
-%ifarch %{ix86}
-VALGRIND=memcheck make check
-%else
 make check
+%ifnarch s390 %{arm}
+VALGRIND=memcheck make check
 %endif
 
 %install
@@ -84,10 +84,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/substrings.pl
 
 %changelog
+* Wed Jan 20 2016 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 2.8.8-3
+- Valgrind is not available only on s/390
+- tests with Valgrind fail only on arm
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-* Fri Sep 18 2014 Caolán McNamara <caolanm@redhat.com> - 2.8.8-1
+* Thu Sep 18 2014 Caolán McNamara <caolanm@redhat.com> - 2.8.8-1
 - latest version
 
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.7-3