diff --git a/netcdf.spec b/netcdf.spec
index c00cd3d..2be39c1 100644
--- a/netcdf.spec
+++ b/netcdf.spec
@@ -1,6 +1,6 @@
 Name:           netcdf
 Version:        4.4.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
@@ -19,7 +19,7 @@ BuildRequires:  gawk
 BuildRequires:  libcurl-devel
 BuildRequires:  m4
 BuildRequires:  zlib-devel
-%ifnarch s390 s390x %{mips}
+%ifarch %{valgrind_arches}
 BuildRequires:  valgrind
 %endif
 #mpiexec segfaults if ssh is not present
@@ -35,10 +35,13 @@ Requires:       hdf5%{?_isa} = %{_hdf5_version}
 %global with_mpich 0
 %endif
 %endif
+
+%if 0%{?fedora} < 26
 %ifarch s390 s390x
 # No openmpi on s390(x)
 %global with_openmpi 0
 %endif
+%endif
 
 %if %{with_mpich}
 %global mpi_list mpich
@@ -334,6 +337,9 @@ done
 
 
 %changelog
+* Thu Dec 08 2016 Dan Horák <dan[at]danny.cz> - 4.4.1.1-3
+- Enable openmpi for s390(x) on F>=26
+
 * Tue Dec 06 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.1.1-2
 - Rebuild for hdf5 1.8.18