diff --git a/mvapich2.changes b/mvapich2.changes
index 870fc83..7445c38 100644
--- a/mvapich2.changes
+++ b/mvapich2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 15 15:50:21 UTC 2018 - cgoll@suse.com
+
+- build with pmi/slurm support (bsc#1085506)
+
 -------------------------------------------------------------------
 Fri Feb  9 11:29:26 UTC 2018 - cgoll@suse.com
 
diff --git a/mvapich2.spec b/mvapich2.spec
index 98a5c28..fe5ffb7 100644
--- a/mvapich2.spec
+++ b/mvapich2.spec
@@ -179,6 +179,7 @@ BuildRequires:  mpi-selector
 %else
 BuildRequires:  %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
 BuildRequires:  lua-lmod
+BuildRequires:  slurm-devel
 BuildRequires:  suse-hpc
 %endif
 %if "%{build_flavor}" == "psm"
@@ -290,6 +291,8 @@ cp /usr/share/automake*/config.* .
 %if %{with hpc}
 %{hpc_setup}
 %{hpc_configure} \
+    --with-pmi=pmi2 \
+    --with-pm=slurm \
 %else
 %configure \
     --prefix=%{p_prefix} \