diff --git a/mathgl.spec b/mathgl.spec
index bd471d1..c5b6d6b 100644
--- a/mathgl.spec
+++ b/mathgl.spec
@@ -1,6 +1,10 @@
+%ifnarch s390 s390x
+%global with_openmpi 1
+%endif
+
 Name:          mathgl
 Version:       2.2.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Cross-platform library for making high-quality scientific graphics
 Summary(de):   Plattformübergreifende Bibliothek für hochwertige wissenschaftliche Graphiken
 Summary(ru):   Библиотека для осуществления высококачественной визуализации данных
@@ -130,6 +134,7 @@ Requires:      %{name} = %{version}-%{release}
 Binaries for generation examples of illustrations that could be 
 prepared by %{name}.
 
+%if 0%{?with_openmpi}
 %package openmpi
 Summary:       OpenMPI version of %{name} library
 Group:         Applications/Engineering
@@ -147,6 +152,7 @@ Requires:      %{name}-openmpi%{_isa} = %{version}-%{release}
 
 %description openmpi-devel
 %{summary}.
+%endif
 
 %package mpich
 Summary:       MPICH version of %{name} library
@@ -230,10 +236,12 @@ MPI_COMPILER_NAME=serial %building_serial
 export CC=mpicc
 export CXX=mpicxx
 
+%if 0%{?with_openmpi}
 # OpenMPI
 %{_openmpi_load}
 MPI_COMPILER_NAME=openmpi %building
 %{_openmpi_unload}
+%endif
 
 # MPICH2
 %{_mpich_load}
@@ -255,10 +263,12 @@ rm -r %{buildroot}%{_libdir}/$MPI_COMPILER_NAME/usr
 # Serial
 make install DESTDIR=%{buildroot} -C %{_target_platform}_serial INSTALL="install -p"
 
+%if 0%{?with_openmpi}
 # OpenMPI
 %{_openmpi_load}
 MPI_COMPILER_NAME=openmpi %installing
 %{_openmpi_unload}
+%endif
 
 # MPICH
 %{_mpich_load}
@@ -340,6 +350,7 @@ fi
 %files examples
 %{_bindir}/mgl_*example
 
+%if 0%{?with_openmpi}
 %files openmpi
 %doc COPYING
 %{_libdir}/openmpi/lib/*.so.*
@@ -347,6 +358,7 @@ fi
 %files openmpi-devel
 %{_libdir}/openmpi/lib/*.so
 %{_includedir}/openmpi-%{_arch}/mgl2/
+%endif
 
 %files mpich
 %doc COPYING
@@ -357,6 +369,9 @@ fi
 %{_includedir}/mpich-%{_arch}/mgl2/
 
 %changelog
+* Mon Feb 17 2014 Dan Horák <dan[at]danny.cz> - 2.2.1-3
+- Conditionalize openmpi support, fixes build on s390(x)
+
 * Fri Feb  7 2014 Dmitrij S. Kryzhevich <krege@land.ru> - 2.2.1-2
 - Workaround for race condition during package building.