diff --git a/AUTHORS b/AUTHORS
index bc57d22092d21565c8218d65967f199eb1bfd9ff..69abfb665c07e6b7cc1aee4de622a2b6bc17768f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,6 +2,7 @@ Don Albert <Don.Albert@bull.com>
 Ernest Artiaga <ernest.artiaga@bsc.es>
 Danny Auble <auble1@llnl.gov>
 Susanne Balle <susanne.balle@hp.com>
+Anton Blanchard <anton@samba.org>
 Hongjia Cao <hgcao@nudt.edu.cn>
 Chuck Clouston <Chuck.Clouston.bull.com>
 Daniel Christians <Daniel.Christians@hp.com>
diff --git a/NEWS b/NEWS
index 6696ae7ebfaaadf0e279dff03cf00fee74c1a95b..e28b7b68c3e92d5b39d8479c378ede0d312ec3b3 100644
--- a/NEWS
+++ b/NEWS
@@ -166,7 +166,9 @@ documents those changes that are of interest to users and admins.
 * Changes in SLURM 1.1.22
 =========================
  - Add squeue option to print a job step's task count (-o %A).
-   
+ - Initialize forward_struct to avoid trying to free a bad pointer,
+   patch from Anton Blanchard (SAMBA).
+
 * Changes in SLURM 1.1.21
 =========================
  - BLUEGENE - Wait on a fini to make sure all threads are finished before
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index d4af152dcd6042220140eb1f6385d2a7c39d5bcb..eb429360b2438f29c2554a2ec39abe61d1120c7f 100644
--- a/doc/html/team.shtml
+++ b/doc/html/team.shtml
@@ -22,6 +22,7 @@
 <li>Amjad Majid Ali (Colorado State University)</li>
 <li>Don Albert (Bull)</li>
 <li>Ernest Artiaga (Barcelona Supercomputer Center, Spain)</li>
+<li>Anton Blanchard (Samba)</li>
 <li>Hongjia Cao (National University of Defense Techonogy, China)</li>
 <li>Daniel Christians (HP)</li>
 <li>Chuck Clouston (Bull)</li>
@@ -47,6 +48,6 @@ Networking, Italy)</li>
 <li>Anne-Marie Wunderlin (Bull)</li>
 </ul>
 
-<p style="text-align:center;">Last modified 28 November 2006</p>
+<p style="text-align:center;">Last modified 11 December 2006</p>
 
 <!--#include virtual="footer.txt"-->