diff --git a/bout++.spec b/bout++.spec
index c511a56..7b22de9 100644
--- a/bout++.spec
+++ b/bout++.spec
@@ -20,22 +20,14 @@ Patch0:  remove-mpark.patch
 %bcond_without test
 %endif
 
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%ifarch ppc64
-# No mpich on ppc64 in EL6
-%bcond_with mpich
-%else
+# Enable both mpi every where
 %bcond_without mpich
-%endif
-%else
-%bcond_without mpich
-%endif
-
-%ifarch s390 s390x
-# No openmpi on s390(x)
-%bcond_with openmpi
-%else
 %bcond_without openmpi
+
+%ifarch s390x
+# This package fails its testsuite when LTO is enabled.  It is not yet clear if
+# this is an LTO issue or an issue with the package itself
+%define _lto_cflags %{nil}
 %endif
 
 # Enable weak dependencies
@@ -420,7 +412,7 @@ do
     export OMPI_MCA_rmaps_base_oversubscribe=yes
     pushd build_$mpi
     make %{?_smp_mflags} build-check
-    make check
+    SEGFAULT_SIGNALS="abrt segv" LD_PRELOAD=%{_libdir}/libSegFault.so make check
     popd
     if [ $mpi = mpich ] ; then
         %_mpich_unload
@@ -501,6 +493,9 @@ done
 #
 
 %changelog
+* Sat Aug 08 2020 David Schwörer <schword2mail.dcu.ie> - 4.3.1-5
+- Disable lto for s390x
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.1-4
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild