diff --git a/AUTHORS b/AUTHORS
index 0e32c9ef5..9e2b71218 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,16 +1,22 @@
 Andrey Brindeyev <abrindeyev@griddynamics.com>
+Antony Messerli <amesserl@rackspace.com>
 Brian Lamar <brian.lamar@rackspace.com>
 Brian Waldon <brian.waldon@rackspace.com>
 Chris Behrens <cbehrens@codestud.com>
-Christopher MacGown <chris@pistoncloud.com>
+Christopher MacGown <ignoti+github@gmail.com>
 Ed Leafe <ed@leafe.com>
 Eldar Nugaev <eldr@ya.ru>
 Ilya Alekseyev <ilyaalekseyev@acm.org>
 Johannes Erdfelt <johannes.erdfelt@rackspace.com>
+Josh Kearney <jkearney@nova.(none)>
 Josh Kearney <josh@jk0.org>
 Kevin L. Mitchell <kevin.mitchell@rackspace.com>
 Kirill Shileev <kshileev@griddynamics.com>
 Lvov Maxim <mlvov@mirantis.com>
 Matt Dietz <matt.dietz@rackspace.com>
 Sandy Walsh <sandy.walsh@rackspace.com>
+Sandy Walsh <sandy@sandywalsh.com>
+comstud <cbehrens+github@codestud.com>
 jerdfelt <johannes@erdfelt.com>
+root <root@debian.ohthree.com>
+termie <github@anarkystic.com>
diff --git a/novaclient/client.py b/novaclient/client.py
index e04c323e8..874c3484a 100644
--- a/novaclient/client.py
+++ b/novaclient/client.py
@@ -1,5 +1,5 @@
 # Copyright 2010 Jacob Kaplan-Moss
-# Copyright 2011 Piston Cloud Computing
+# Copyright 2011 Piston Cloud Computing, Inc.
 
 """
 OpenStack Client interface. Handles the REST calls and responses.
diff --git a/tools/generate_authors.sh b/tools/generate_authors.sh
new file mode 100644
index 000000000..c41f07988
--- /dev/null
+++ b/tools/generate_authors.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+git shortlog -se | cut -c8-