diff --git a/NEWS b/NEWS
index 13a613d2f7250d12d2656cc3a4ee71921f271286..33a0e98a24e77aaa4422ca5266211f46adad51fd 100644
--- a/NEWS
+++ b/NEWS
@@ -230,6 +230,7 @@ documents those changes that are of interest to users and admins.
     any checkpoint plugin.
  -- Fix issue where if using munge and munge wasn't running and a slurmd
     needed to forward a message the slurmd would core dump.
+ -- Update srun.1 man page documenting the PMI2 support.
 
 * Changes in Slurm 2.6.6
 ========================
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index 7f2856a66a96b2bbac7cf77a4e37baaa30ba76dd..d3ef73326485f4f387f7448e36728af78a37b081 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -931,6 +931,13 @@ For use with Infiniband.
 .B openmpi
 For use with OpenMPI.
 .TP
+.B pmi2
+To enable PMI2 support. The PMI2 support in Slurm works only if the MPI
+implementation supports it, in other words if the MPI has the PMI2
+interface implemented. The --mpi=pmi2 will load the library
+lib/slurm/mpi_pmi2.so which provides the server side functionality but
+the client side must implement PMI2_Init() and the other interface calls.
+.TP
 .B none
 No special MPI processing. This is the default and works with
 many other versions of MPI.