diff --git a/valgrind.spec b/valgrind.spec
index a43a859..a5c79be 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.10.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -304,12 +304,14 @@ rm -f docs/installed/*.ps
 # generating the MPI library requires picks them up and sets up the right
 # openmpi libmpi.so requires. Install symlinks in the original/upstream
 # location for backwards compatibility.
+%if %{build_openmpi}
 pushd $RPM_BUILD_ROOT%{_libdir}
 mkdir -p openmpi/valgrind
 cd valgrind
 mv libmpiwrap-%{valarch}-linux.so ../openmpi/valgrind/
 ln -s ../openmpi/valgrind/libmpiwrap-%{valarch}-linux.so
 popd
+%endif
 
 %if "%{valsecarch}" != ""
 pushd $RPM_BUILD_ROOT%{_libdir}/valgrind/
@@ -403,6 +405,9 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Mon Aug 17 2015 Mark Wielaard <mjw@redhat.com> - 3.10.1-20
+- Don't try to move around libmpiwrap when not building for openmpi (s390x)
+
 * Fri Aug 14 2015 Mark Wielaard <mjw@redhat.com> - 3.10.1-19
 - Install libmpiwrap library under {_libdir}/openmpi/valgrind (#1238428)