diff --git a/AUTHORS.TXT b/AUTHORS.TXT
new file mode 100644
index 00000000000..fc6acff48da
--- /dev/null
+++ b/AUTHORS.TXT
@@ -0,0 +1,215 @@
+Michael DeHaan <michael.dehaan@gmail.com>
+Daniel Hokka Zakrisson <daniel@hozac.com>
+Stephen Fromm <sfromm@gmail.com>
+Seth Vidal <skvidal@fedoraproject.org>
+Tim Bielawa <tbielawa@redhat.com>
+Dag Wieers <dag@wieers.com>
+Jan-Piet Mens <jpmens@gmail.com>
+Jeroen Hoekx <jeroen.hoekx@hamok.be>
+Lorin Hochstein <lorin@nimbisservices.com>
+Michel Blanc <mb@mbnet.fr>
+Stephen Fromm <stephenf@nero.net>
+Matthew Williams <matthew@flowroute.com>
+Marco Vito Moscaritolo <mavimo@gmail.com>
+Mark Theunissen <mark.theunissen@gmail.com>
+Brian Coca <briancoca+ansible@gmail.com>
+Dave Hatton <mail@davehatton.it>
+Pepe Barbe <dev@antropoide.net>
+Peter Sankauskas <pas256@gmail.com>
+John Kleint <jkleint@gmail.com>
+Derek Carter <goozbach@friocorte.com>
+Dane Summers <dsummersl@yahoo.com>
+Romeo Theriault <romeot@hawaii.edu>
+Matt Wright <mdw1980@gmail.com>
+Nigel Metheringham <nigel.metheringham@jrtheatre.co.uk>
+Brad Olson <brado@movedbylight.com>
+Chris Hoffman <christopher.hoffman@gmail.com>
+Timothy Appnel <tim@appnel.com>
+fdavis <reddot357@hotmail.com>
+Dietmar Schinnerl <SleeplessAnnoyedNerd+github@gmail.com>
+jkleint <jkleint@gmail.com>
+Jeroen Hoekx <jeroen@hoekx.be>
+Wes Johnson <wes@futureprefect.com>
+Nikhil Singh <nix85@ymail.com>
+Daniel Néri <dne@mayonnaise.net>
+Tim Gerla <tim@gerla.net>
+lwade <lestertron@gmail.com>
+Rodney Quillo <imcocoy@gmail.com>
+Christopher Johnston <chjohnst@gmail.com>
+Stoned Elipot <stoned.elipot@gmail.com>
+Yeukhon Wong <yeukhon@acm.org>
+Anastasis Andronidis <anastasis90@yahoo.gr>
+cocoy <imcocoy@gmail.com>
+Yves Dorfsman <yves@zioup.com>
+Brian Coca <briancoca+dev@gmail.com>
+Shaun Zinck <shaun.zinck@gmail.com>
+Dag Wieërs <dag@wieers.com>
+Ludovic Claude <ludovic.claude@lbpoker.com>
+Peter Sankauskas <peter@admobius.com>
+Petros Moisiadis <pmoisiadis@modulus.gr>
+Ahmad Khayyat <akhayyat@gmail.com>
+Matt Wright <matt@nobien.net>
+Serge van Ginderachter <serge@vanginderachter.be>
+Fred Alger <fred@fredalger.net>
+Aleksej Romanov <alopropoz2@yandex.ru>
+Aurélien Bondis <aurelien.bondis@gmail.com>
+Johan Wirén <johan.wiren@init.se>
+Gregory Duchatelet <skygreg@gmail.com>
+Jimmy Tang <jtang@tchpc.tcd.ie>
+Henry Graham <henry.graham@mail.wvu.edu>
+Jeremy Smitherman <jeremysmitherman@gmail.com>
+Jim Richardson <weaselkeeper@gmail.com>
+Ingo Gottwald <i.gottwald@tomorrow-focus.de>
+Fabian Arrotin <fabian.arrotin@arrfab.net>
+Silviu Dicu <silviudicu@gmail.com>
+Blair Zajac <blair@imageworks.com>
+Christoph Seitz <christoph_seitz@gmx.de>
+Cosmin Luță <q4break@gmail.com>
+Félix Sipma <gueux@gueux.org>
+Grzegorz Nosek <root@localdomain.pl>
+John Callender <jbc@jbcsystems.com>
+John Eckersberg <jeckersb@redhat.com>
+Jonathan Palley <jpalley@gmail.com>
+Kavin Kankeshwar <kavin@aerospike.com>
+Lester Wade <lestertron@gmail.com>
+Luke Antins <luke@lividpenguin.com>
+Maxim Burgerhout <maxim@wzzrd.com>
+Nigel Metheringham <nigel.metheringham@dev.intechnology.co.uk>
+Nigel Metheringham <nigel@dotdot.it>
+Norman J. Harman Jr <njharman@gmail.com>
+Sebastien Bocahu <sebastien@ispfr.net>
+Sundar Raman <cybertoast@gmail.com>
+Will Thames <willdthames@gmail.com>
+lessmian <lessmian@lessmian.pl>
+willthames <willdthames@gmail.com>
+afterburn <afterburn>
+Lorin Hochstein <lorinh@gmail.com>
+bradobro <brado@movedbylight.com>
+Chelsea Robb <crobb@yourtutor.com.au>
+Brendan Beveridge <brendan.beveridge@zeptonics.com>
+Philipp Grau <phgrau@zedat.fu-berlin.de>
+Matthew Johnson <mjjohnson33@gmail.com>
+Nathan A. Feger <nfeger@spredfast.com>
+Junegunn Choi <junegunn.c@gmail.com>
+Ton Kersten <tonk@master.tonkersten.com>
+Maykel Moya <mmoya@mmoya.org>
+Les Aker <me@lesaker.org>
+Rafal Lewczuk <rafal.lewczuk@gmail.com>
+Jeremy Katz <jeremy@katzbox.net>
+Patrik Lundin <patrik.lundin.swe@gmail.com>
+Stijn Opheide <stijn@webcomrades.com>
+Will Thames <will@musc.org.uk>
+willthames <will@musc.org.uk>
+Jesse Andrews <anotherjesse@gmail.com>
+Marco Vito Moscaritolo <marco@mavimo.org>
+James Martin <jmartin@basho.com>
+Pepe Barbe <barbe@telsasoft.com>
+Matt Coddington <coddington@gmail.com>
+Ingo Gottwald <ingo@net-freakz.de>
+u348095 <will.thames@suncorp.com.au>
+willthames <will@thames.id.au>
+Hubert Feyrer <hubertf@gmx.de>
+Juha Litola <juha.litola@iki.fi>
+Jayson Vantuyl <jayson@aggressive.ly>
+Javier Candeira <javier@candeira.com>
+Martijn Koster <mak-github@greenhills.co.uk>
+Nandor Sivok <nandor@gawker.com>
+Rune Kaagaard <rumi.kg@gmail.com>
+Igor Galić <i.galic@brainsware.org>
+Matt Cordial <matt.cordial@asu.edu>
+Chris Geddings <chris.geddings@duke.edu>
+schmic <mic+git@buks.eu.org>
+Matt Goodall <matt.goodall@gmail.com>
+Chin Fang <fangchin@zettar.com>
+Dave Peticolas <dave@krondo.com>
+Stavros Korokithakis <stavros@korokithakis.net>
+Patrick Pelletier <pp.pelletier@gmail.com>
+willthames <will.thames@suncorp.com.au>
+Florian Diebold <flodiebold@gmail.com>
+Till Maas <opensource@till.name>
+Brendan Taylor <brendan@inkdit.com>
+martin f. krafft <madduck@madduck.net>
+Vincent Van der Kussen <vincent@vanderkussen.org>
+ron1 <wmdc1987@aol.com>
+Yvan Cottyn <vanten@me.com>
+Ashley Penney <apenney@edx.org>
+alex <alex@zabimaru.(none)>
+bleader <bleader@ratonland.org>
+Ali Asad Lotia <ali.asad.lotia@gmail.com>
+davixx <david.chanial@gmail.com>
+Piffey Parlance <piffey@piffey.net>
+felix <felix@ordrin.com>
+igor <igor@c-base.org>
+Michael Lambert <mklambert@gmail.com>
+Jure Triglav <juretriglav@gmail.com>
+Alexandre Bourget <alex@bourget.cc>
+ftao <filia.tao@gmail.com>
+jibs <jibran.s+gh@gmail.com>
+Alan Orth <alan.orth@gmail.com>
+Jeremiah Heller <jeremiah@inertialbit.net>
+Jeremy Penner <jeremy@sporktania.com>
+Jens Rantil <jens.rantil@gmail.com>
+Jeff Blaine <jblaine@kickflop.net>
+Joel Roller <roller@snth.net>
+Johan Wirén <johan.wiren.se@gmail.com>
+junyoung <junyoung@daumcorp.com>
+John Gosset <john.gosset@gmail.com>
+Adam Denenberg <adam@dberg.org>
+Jonathan Palley <jpalley@idapted.com>
+Jonte Norman <jonte.n@gmail.com>
+Joshua Tacoma <joshua@yellowseed.org>
+K. Preyk <a.laas@asco.de>
+Lennie <github@consolejunkie.net>
+mxxcon <mxxcon@gmail.com>
+Lester Wade <lwade@dreadnought.home.gateway>
+Gert Goet <gert@thinkcreate.nl>
+Gary Richards <garyr@gasid.org.uk>
+Mark Maas <mark@maas-martin.nl>
+Francis Besset <francis.besset@gmail.com>
+Marko Mikulicic <marko.mikulicic@isti.cnr.it>
+Matt Klich <matt.klich@readytalk.com>
+Francesc Esplugas <contact@francescesplugas.com>
+Matthew Johnson <mjohnson@blackboard.com>
+Felix Ingram <f.ingram@gmail.com>
+Max Spransy <maxjustus@gmail.com>
+root <root@admvmcctl001.adm.ops>
+Fabian Arrotin <arrfab@centos.org>
+Elliott Foster <elliottf@codebrews.com>
+Miek Gieben <miek@miek.nl>
+Mikael Zayenz Lagerkvist <zayenz@gmail.com>
+Mike Grozak <mike.grozak@gmail.com>
+Nathan A. Feger <nafeger@gmail.com>
+Dave Peticolas <dpeticol@lucasfilm.com>
+shlomozippel <shlomo.zippel@gmail.com>
+Oscar Korz <okorz001@gmail.com>
+Dave Coutu <cout@alum.wpi.edu>
+Daniel Néri <dne+github@mayonnaise.net>
+Collin Allen <collin@command-tab.com>
+Petetin Ludovic <ludovic@powder-lx.(none)>
+Christopher A. Snapp <snappca@gmail.com>
+Piotr Kweclich <piotr.kweclich@contium.pl>
+Piotr Kweclich <piotrkweclich@gmail.com>
+Piotr Roszatycki <piotr.roszatycki@gmail.com>
+Ralph Bean <rbean@redhat.com>
+Reed Murphy <reed@reedmurphy.net>
+Rob Parrott <robparrott@gmail.com>
+Chris Read <chris.read@gmail.com>
+Chris Hoffman <choffman@chathamfinancial.com>
+Romeo Theriault <romeot@mbp.local>
+Scott Anderson <scottanderson42@gmail.com>
+vincent Van der Kussen <vincent@localhost.localdomain>
+Sergey Popov <admin@pinkbyte.ru>
+Chris Berkhout <chrisberkhout@gmail.com>
+ADRIyas <adriyas@gmail.com>
+Sri Harsha Yalamanchili <harsha@thought-matrix.com>
+Stanis Trendelenburg <stanis.trendelenburg@gmail.com>
+Stefane Fermigier <sf@fermigier.com>
+Chandler Latour <chandler.latour@gmail.com>
+Steve Frank <lardcanoe@gmail.com>
+Brian Coca <bcoca@tablethotels.com>
+Sébastien Bocahu <zecrazytux@zecrazytux.net>
+Brandon Alexander <baalexander@gmail.com>
+Ton Kersten <github@tonkersten.com>
+Boyd Adamson <boyd@boydadamson.com>
+Bowe Strickland <bowe@yak.net>
+diefans <oliver@digitalarchitekt.de>
diff --git a/Makefile b/Makefile
index 4e5d1ee4f69..8e3f4c02efe 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,10 @@ tests:
 	PYTHONPATH=./lib nosetests -d -v
 
 # To force a rebuild of the docs run 'touch VERSION && make docs'
-docs: $(MANPAGES) modulepages
+docs: $(MANPAGES) modulepages webdocs authors
+
+authors:
+	sh hacking/authors.sh
 
 # Regenerate %.1.asciidoc if %.1.asciidoc.in has been modified more
 # recently than %.1.asciidoc.
diff --git a/hacking/authors.sh b/hacking/authors.sh
new file mode 100644
index 00000000000..f9287828e4c
--- /dev/null
+++ b/hacking/authors.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+# script from http://stackoverflow.com/questions/12133583
+set -e
+
+# Get a list of authors ordered by number of commits
+# and remove the commit count column
+AUTHORS=$(git --no-pager shortlog -nse | cut -f 2-)
+if [ -z "$AUTHORS" ] ; then
+    echo "Authors list was empty"
+    exit 1
+fi
+
+# Display the authors list and write it to the file
+echo "$AUTHORS" | tee "$(git rev-parse --show-toplevel)/AUTHORS.TXT" | sort