diff --git a/slurm.spec b/slurm.spec
index 52d6717..dfe4fe5 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -30,7 +30,8 @@ Patch0:         slurm_libslurmfull_version.patch
 Patch10:        slurm_perlapi_rpaths.patch
 Patch11:        slurm_html_doc_path.patch
 Patch12:        slurm_doc_fix.patch
-Patch13:        slurm_do_not_build_cray.patch
+Patch13:        slurm_without_cray.patch
+Patch14:        slurm_without_pmi.patch
 
 # Fedora-related patches
 Patch20:        slurm_pmix_soname.patch
@@ -191,6 +192,7 @@ Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
@@ -350,10 +352,6 @@ install -m 0644 contribs/lua/proctrack.lua %{buildroot}%{_docdir}/%{name}/contri
 
 # remove libtool archives
 find %{buildroot} -name \*.a -o -name \*.la | xargs rm -f
-# remove pmi/pmi2 headers which are provided by pmix dependency
-rm -rf %{buildroot}%{_includedir}/%{name}/pmi*.h
-# remove libpmi/pmi2 libraries which are provided by pmix dependency
-rm -rf %{buildroot}%{_libdir}/libpmi*.so*
 # remove libslurmfull symlink (non-development, internal library)
 rm -rf %{buildroot}%{_libdir}/libslurmfull.so
 # remove auth_none plugin
diff --git a/slurm_do_not_build_cray.patch b/slurm_do_not_build_cray.patch
deleted file mode 100644
index 7ec7ecc..0000000
--- a/slurm_do_not_build_cray.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/contribs/Makefile.am b/contribs/Makefile.am
-index 24ab9de7cc..087262c347 100644
---- a/contribs/Makefile.am
-+++ b/contribs/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = cray lua mic openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque
-+SUBDIRS = lua mic openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque
- 
- EXTRA_DIST = \
- 	gcp			\
diff --git a/slurm_without_cray.patch b/slurm_without_cray.patch
new file mode 100644
index 0000000..7ec7ecc
--- /dev/null
+++ b/slurm_without_cray.patch
@@ -0,0 +1,10 @@
+diff --git a/contribs/Makefile.am b/contribs/Makefile.am
+index 24ab9de7cc..087262c347 100644
+--- a/contribs/Makefile.am
++++ b/contribs/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = cray lua mic openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque
++SUBDIRS = lua mic openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque
+ 
+ EXTRA_DIST = \
+ 	gcp			\
diff --git a/slurm_without_pmi.patch b/slurm_without_pmi.patch
new file mode 100644
index 0000000..782149c
--- /dev/null
+++ b/slurm_without_pmi.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6f225183f9..d7d819dc55 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -30,7 +30,6 @@ EXTRA_DIST =			\
+ 	META
+ 
+ pkginclude_HEADERS =		\
+-	slurm/pmi.h		\
+ 	slurm/slurm.h 		\
+ 	slurm/slurmdb.h 	\
+ 	slurm/slurm_errno.h	\
+diff --git a/contribs/Makefile.am b/contribs/Makefile.am
+index 7fa8d82436..d9d6042ec8 100644
+--- a/contribs/Makefile.am
++++ b/contribs/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = lua mic openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque
++SUBDIRS = lua mic openlava pam pam_slurm_adopt perlapi seff sgather sgi sjobexit torque
+ 
+ EXTRA_DIST = \
+ 	gcp			\