diff --git a/doc/html/faq.shtml b/doc/html/faq.shtml
index 67c4b1656590dbfd0f35b9d3e17d610833c75d5b..40d322f2859530f823a4f8dffaaa52c807697532 100644
--- a/doc/html/faq.shtml
+++ b/doc/html/faq.shtml
@@ -44,6 +44,8 @@
 the <i>slurm-dev</i> mailing list?</a></li>
 <li><a href="#job_size">Can I change my job's size after it has started
 running?</a></li>
+<li><a href="#mpi_symbols">Why is my MPIHCH2 or MVAPICH2 job not running with
+SLURM? Why does the DAKOTA program not run with SLURM?</a></li>
 </ol>
 
 <h2>For Administrators</h2>
@@ -776,7 +778,7 @@ icrm1
 icrm2
 icrm3
 icrm4
-icrm5
+icrm5Desktop
 icrm6
 icrm7
 icrm8
@@ -785,6 +787,16 @@ exit
 salloc: Relinquishing job allocation 65542
 </pre>
 
+<p><a name="mpi_symbols"><b>25. Why is my MPIHCH2 or MVAPICH2 job not running with
+SLURM? Why does the DAKOTA program not run with SLURM?</b></a><br>
+The SLURM library used to support MPIHCH2 or MVAPICH2 references a variety of
+symbols. If those symbols resolve to functions or variables in your program
+rather than the appropriate library, the application will fail. In the case of
+<a href="http://dakota.sandia.gov">DAKOTA</a>, it contains a function named
+<b>regcomp</b>, which will get used rather than the POSIX regex functions.
+Rename DAKOTA's function and references from regcomp to something else to make
+it work properly.</p>
+
 <p class="footer"><a href="#top">top</a></p>
 
 
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index 492351a2f3dbe03739d96947efaf2b354b3a3d13..6c7646638ef6a1da0d57c4948f8ab2df895488e6 100644
--- a/doc/html/team.shtml
+++ b/doc/html/team.shtml
@@ -85,6 +85,7 @@ organizations. The current SLURM development staff includes: </p>
 <li>Adam Todorski (Rensselaer Polytechnic Institute)</li>
 <li>Nathan Weeks (Iowa State University)</li>
 <li>Tim Wickberg (Rensselaer Polytechnic Institute)</li>
+<li>Ramiro Brito Willmersdorf (Universidade Federal de Pemambuco, Brazil)</li>
 <li>Jay Windley (Linux NetworX)</li>
 <li>Anne-Marie Wunderlin (Bull)</li>
 </ul>