diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 433031ce8812587ab0f96d126e4d985e7b60d66d..56bc41fa6b938e4521023052d05d82e2362f244e 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -112,6 +112,8 @@ COMMAND CHANGES (see man pages for details)
 
 OTHER CHANGES
 =============
+ - Added PMI2 client library. Refere to the documentation here:
+   http://slurm.schedmd.com/mpi_guide.html#mpich2
  - Added SLURM_SUBMIT_HOST to salloc, sbatch and srun job environment.
  - Added SLURM_ARRAY_TASK_ID and SLURM_ARRAY_TASK_ID to environment of job
    array.
diff --git a/doc/html/mpi_guide.shtml b/doc/html/mpi_guide.shtml
index 0edc6b8762f25171f84d7e511ec626f9596a0b01..4fc550fc60887c2209be702726e1dccd1be13a64 100644
--- a/doc/html/mpi_guide.shtml
+++ b/doc/html/mpi_guide.shtml
@@ -290,7 +290,6 @@ in the example below below.</p>
 srun -n4 --mpi=pmi2 ./a.out
 </pre>
 
-<b>Note:</b>
 <p>
 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 <i>--mpi=pmi2</i> will load the  library <i>lib/slurm/mpi_pmi2.so</i>
@@ -302,6 +301,14 @@ You can refere yourself to <i>mpich2-1.5</i> implementation and configure MPICH
 
 <p>
 To check if the MPI version you are using supports PMI2 check for PMI2_* symbols in the MPI library.
+<p>
+SLURM provides a version of the PMI2 client library in the contribs directory. This library gets
+installed in the SLURM lib directory. If your MPI implementation supports PMI2 and you wish to use
+the SLURM provided library you have to link the SLURM provided library explicitly:
+<pre>
+$ mpicc -L&lt;path_to_pim2_lib&gt; -lpmi2 ...
+$ srun -n20 a.out
+</pre>
 
 <hr size=4 width="100%">