diff --git a/mvapich2-pthread_yield.patch b/mvapich2-pthread_yield.patch
deleted file mode 100644
index 53b23d0..0000000
--- a/mvapich2-pthread_yield.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git src/openpa/test/opa_test.h src/openpa/test/opa_test.h
-index 490b916..ec9c7f5 100644
---- src/openpa/test/opa_test.h
-+++ src/openpa/test/opa_test.h
-@@ -20,6 +20,7 @@
- #include <limits.h>
- #include <time.h>
- #if defined(OPA_HAVE_PTHREAD_H)
-+#  define GNU_SOURCE
- #  include <pthread.h>
- #endif /* HAVE_PTHREAD_H */
- 
diff --git a/mvapich2.changes b/mvapich2.changes
index b9de9d9..ba7a662 100644
--- a/mvapich2.changes
+++ b/mvapich2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 16 16:13:32 UTC 2018 - msuchanek@suse.com
+
+- Use sched_yield instead of pthread_yield (boo#1102421).
+  - drop mvapich2-pthread_yield.patch
+
 -------------------------------------------------------------------
 Mon Jun 18 13:12:15 UTC 2018 - nmoreychaisemartin@suse.com
 
diff --git a/mvapich2.spec b/mvapich2.spec
index 9b5567d..cdeaabc 100644
--- a/mvapich2.spec
+++ b/mvapich2.spec
@@ -163,7 +163,6 @@ Source2:        mpivars.csh
 Source3:        macros.hpc-mvapich2
 Source100:      _multibuild
 Patch0:         mvapich2-s390_get_cycles.patch
-Patch1:         mvapich2-pthread_yield.patch
 Patch2:         mvapich2-arm-support.patch
 Url:            http://mvapich.cse.ohio-state.edu/overview/mvapich2/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -293,7 +292,6 @@ is based on MPICH2 and MVICH. This package contains the static libraries
 %{?with_hpc:%hpc_debug}
 %setup -q -n mvapich2-%{version}%{?rc_ver}
 %patch0
-%patch1
 %patch2
 cp /usr/share/automake*/config.* .
 
@@ -315,7 +313,7 @@ cp /usr/share/automake*/config.* .
 %endif
    --docdir=%{_datadir}/doc/%{name} \
    --disable-wrapper-rpath \
-   --disable-wrapper-rpath      \
+   --enable-yield=sched_yield \
 %if "%{build_flavor}" == "psm"
    --with-device=ch3:psm \
    --with-psm=/usr \