diff --git a/doc/html/download.shtml b/doc/html/download.shtml
index c46ac4bae26f148f7fe115f838bb4af552c2374a..f569febf5b198cad4a0425be6d3835571e217179 100644
--- a/doc/html/download.shtml
+++ b/doc/html/download.shtml
@@ -1,8 +1,7 @@
 <!--#include virtual="header.txt"-->
 
 <h1>Download</h1>
-<p>
-SLURM source can be downloaded from
+<p>SLURM source can be downloaded from
 <a href="http://sourceforge.net/projects/slurm/">
 http://sourceforge.net/projects/slurm/</a><br>
 SLURM has also been packaged for
@@ -10,6 +9,11 @@ SLURM has also been packaged for
 <a href="http://packages.ubuntu.com/src:slurm-llnl">Ubuntu</a>
 (both named <i>slurm-llnl</i>).</p>
 
+<p>A <a href="http://www.bsc.es/plantillaA.php?cat_id=705">SLURM simulator</a>
+is available to assess various scheduling policies.
+Under simulation jobs are not actually executed. Instead a job execution trace
+from a real system or a synthetic trace are used.</p>
+
 <p>Related software available from various sources include:
 <ul>
 
@@ -204,6 +208,6 @@ Portable Linux Processor Affinity (PLPA)</a></li>
 
 </ul>
 
-<p style="text-align:center;">Last modified 20 December 2010</p>
+<p style="text-align:center;">Last modified 24 May 2011</p>
 
 <!--#include virtual="footer.txt"-->
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index 6c7646638ef6a1da0d57c4948f8ab2df895488e6..a0a45ed1f26342f0e3751531168d7009d908b79f 100644
--- a/doc/html/team.shtml
+++ b/doc/html/team.shtml
@@ -62,6 +62,7 @@ organizations. The current SLURM development staff includes: </p>
 <li>Bryan O'Sullivan (Pathscale)</li>
 <li>Gennaro Oliva (Institute of High Performance Computing and
     Networking, Italy)</li>
+<li>Alejandro Lucero Palau (Barcelona Supercomputer Center, Spain)</li>
 <li>Daniel Palermo (HP)</li>
 <li>Dan Phung (LLNL/Columbia University)</li>
 <li>Ashley Pittman (Quadrics, UK)</li>
@@ -90,6 +91,6 @@ organizations. The current SLURM development staff includes: </p>
 <li>Anne-Marie Wunderlin (Bull)</li>
 </ul>
 
-<p style="text-align:center;">Last modified 13 May 2011</p>
+<p style="text-align:center;">Last modified 24 May 2011</p>
 
 <!--#include virtual="footer.txt"-->