diff --git a/coin-or-Ipopt.spec b/coin-or-Ipopt.spec
index 6165ee9..12b097d 100644
--- a/coin-or-Ipopt.spec
+++ b/coin-or-Ipopt.spec
@@ -15,23 +15,32 @@
 %global _libmpichdir %{_libdir}/mpich/lib
 %global _binmpichdir %{_libdir}/mpich/bin
 
-# On these arches MUMPS and 
-# metis unavailable
-ExcludeArch: s390 s390x
-
-%if 0%{?rhel} < 7
-ExcludeArch: ppc64
+%if 0%{?rhel} || 0%{?rhel} < 7
+%ifarch %{power64}
+%global with_mpich 0
 %endif
-
-%global with_openmpi 1
+%endif
+%if 0%{?rhel} || 0%{?rhel} < 7
+%ifnarch %{power64}
+%global with_mpich 1
+%endif
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %global with_mpich 1
+%endif
+%ifarch s390x
+%global with_openmpi 0
+%else
+%global with_openmpi 1
+%endif
+
 %global with_asl 1
 
 Name:  coin-or-%{module}
 Group: Applications/Engineering
 Summary: Interior Point OPTimizer
 Version: 3.12.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: EPL and GPLv2+
 URL:  https://projects.coin-or.org/%{module}
 Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz
@@ -523,6 +532,10 @@ cd ..
 %{_docdir}/%{name}/*.pdf
 
 %changelog
+* Tue Nov 01 2016 Antonio Trande <sagitterATfedoraproject.org> - 3.12.6-4
+- New architectures
+- Build on s390
+
 * Fri Oct 21 2016 Orion Poplawski <orion@cora.nwra.com> - 3.12.6-3
 - Rebuild for openmpi 2.0