diff --git a/AUTHORS b/AUTHORS
index 9b268eaa815e23d1e5a0b4b551053677b7a27648..f72a3bfc40b55b8ac36f2da8b35d84129401fa40 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,7 @@ Christopher Holmes <cholmes@hp.com>
 Takae Hatazaki <takao.hatazaki@hp.com>
 Nathan Huff <nhuff@geekshanty.com>
 David Jackson <jacksond@clusterresources.com>
+Greg Johnson <gjohnson@lanl.gov>
 Morris Jette <jette1@llnl.gov>
 Jason King <king49@llnl.gov>
 Chris Morrone <morrone2@llnl.gov>
diff --git a/DISCLAIMER b/DISCLAIMER
index d5700c59ba5b71ad2a5b4be2485f78801a0bc91f..c679441cab7e14efbf82fb7276eea1e0f9ec8ad9 100644
--- a/DISCLAIMER
+++ b/DISCLAIMER
@@ -13,6 +13,7 @@ Christopher Holmes <cholmes@hp.com>
 Takae Hatazaki <takao.hatazaki@hp.com>
 Nathan Huff <nhuff@geekshanty.com>
 David Jackson <jacksond@clusterresources.com>
+Greg Johnson <gjohnson@lanl.gov>
 Morris Jette <jette1@llnl.gov>
 Jason King <king49@llnl.gov>
 Chris Morrone <morrone2@llnl.gov>
diff --git a/doc/html/team.html b/doc/html/team.html
index 0415918594a5f0c0a021dedcd737c5837c6bae60..d98c3eb2e3b6eb581449f1e600e5ecb13e105ceb 100644
--- a/doc/html/team.html
+++ b/doc/html/team.html
@@ -79,6 +79,7 @@ Ernest Artiaga (barcelona Supercomputer Center></li>
 <li>Takao Hatazaki (HP)</li>
 <li>Nathan Huff (North Dakota State University)</li>
 <li>David Jackson (Cluster Resources)</li>
+<li>Greg Johnson (LANL) </li>
 <li>Jason King (LLNL)</li>
 <li>Bryan O'Sullivan (Pathscale)</li>
 <li>Daniel Palermo (HP)</li>