diff --git a/hypre.spec b/hypre.spec
index ecf76fd..6517d33 100644
--- a/hypre.spec
+++ b/hypre.spec
@@ -11,10 +11,9 @@
 %bcond_without mpich
 %endif
 
-%ifarch s390 s390x
-%bcond_with openmpi
-%else
+%if 0%{?fedora}
 %bcond_without openmpi
+%bcond_without mpich
 %endif
 
 %{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
@@ -26,7 +25,7 @@
 
 Name:           hypre
 Version:        2.14.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        High performance matrix preconditioners
 # FEI_mv/ml/src/Include/ml_vampir.h has a GPL notice, but it doesn't
 # look copyright-significant.
@@ -240,8 +239,12 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
 %_mpich_unload
 %endif
 
+%if 0%{?ldconfig_scriptlets}
+%ldconfig_scriptlets                                                           
+%else
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
+%endif
 
 
 %{!?_licensedir:%global license %doc}
@@ -283,6 +286,9 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
 %doc docs/*.pdf
 
 %changelog
+* Tue Apr 24 2018 Antonio Trande <sagitter@fedoraproject.org> - 2.14.0-2
+- Build hypre-openmpi on s390x (#1571450)
+
 * Fri Mar 23 2018 Dave Love <loveshack@fedoraproject.org> - 2.14.0-1
 - Update to 2.14.0 (#1557645)
 - Reinstate superlu and use superlu_dist