diff --git a/AUTHORS b/AUTHORS
index c489c737988d5058bb96efa8a1cf6e5bf56b0f36..52d1d8c5f2cd9ccd3344441633b29210176daa72 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -44,3 +44,4 @@ Keven Tew <tew1(at)llnl.gov>
 Prashanth Tamraparni <prashanth.tamraparni(at)hp.com>
 Jay Windley <jwindley(at)lnxi.com>
 Ann-Marie Wunderlin<Anne-Marie.Wunderlin(at)Bull.com>
+Artem Y. Polyakov <artemp(at)mellanox.com>
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index 1c57e8f5b1d2f470a6d6ce898b5841c9dcd4f18c..9e38936c309ea97bc865a47514afe91599c343e9 100644
--- a/doc/html/team.shtml
+++ b/doc/html/team.shtml
@@ -183,7 +183,7 @@ Lead Slurm developers are:
 <li>Dan Phung (Lawrence Livermore National Laboratory/Columbia University)</li>
 <li>Ashley Pittman (Quadrics, UK)</li>
 <li>Josko Plazonic (Princecton University)</li>
-<li>Artem Polyakov (ISP SB RAS, Russia)</li>
+<li>Artem Y. Polyakov (Mellanox Technologies, ISP SB RAS, Russia)</li>
 <li>Ludovic Prevost (NEC, France)</li>
 <br>
 <li>Vijay Ramasubramanian (University of Maryland)</li>