diff --git a/AUTHORS b/AUTHORS
index 91983287d..d932ddd61 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,24 +5,62 @@ Adrian Likins <alikins@redhat.com>
 Alexander Saprykin <osapryki@redhat.com>
 Andrew Crosby <acrosby@redhat.com>
 Brian Coca <bcoca@users.noreply.github.com>
+Brian McLaughlin <bmclaugh@redhat.com>
+Bruno Rocha <rochacbruno@users.noreply.github.com>
+Calvin Spealman <cspealma@redhat.com>
 Chris Church <chris@ninemoreminutes.com>
 Chris Houseknecht <chouseknecht@ansible.com>
+Chris Meyers <chrismeyersfsu@users.noreply.github.com>
 Christopher Chase <cchase@redhat.com>
+Chyna Sanders <chsander@redhat.com>
+David Davis <daviddavis@redhat.com>
+David Moreau Simard <moi@dmsimard.com>
 David Newswanger <dnewswan@redhat.com>
 David Zager <dzager@redhat.com>
-Dostonbek <toirovd@berea.edu>
+Dostonbek Toirov <31990136+Dostonbek1@users.noreply.github.com>
+Egor Margineanu <egmar@users.noreply.github.com>
+Evgeni Golov <evgeni@golov.de>
+Guillaume Delacour <gui@iroqwa.org>
 Ivan <iremizov@gmail.com>
 Ivan Remizov <iremizov@gmail.com>
+Jake Jackson <jljacks93@gmail.com>
 James Cammarata <jimi@sngx.net>
+James Tanner <tanner.jc@gmail.com>
+Jason Yundt <jason@jasonyundt.email>
+Jeff Geerling <geerlingguy@mac.com>
 Jiri Tyr <jtyr@users.noreply.github.com>
 Joe Fiorini <joe@joefiorini.com>
+John Barker <john@johnrbarker.com>
 John Corrales <jjcorrales3@gmail.com>
 John R Barker <jobarker@redhat.com>
+John R Barker <john@johnrbarker.com>
 Jorge Heleno <jorge.heleno@ist.utl.pt>
+Jürgen Etzlstorfer <juergen.etzlstorfer@dynatrace.com>
 Karl Goetz <goetzk@users.noreply.github.com>
+Kevin Breit <kevin.breit@kevinbreit.net>
 Khrystyna Bugaienko <kr.bugaienko@gmail.com>
+Kyle <3204236+DevKyleS@users.noreply.github.com>
+Leon M. George <leon@georgemail.eu>
+Martin Hradil <mhradil@redhat.com>
 Martin Krizek <martin.krizek@gmail.com>
+Nicolas Quiniou-Briand <nqb+git@azyx.fr>
+Paul Belanger <pabelanger@gmail.com>
+Paul Belanger <pabelanger@redhat.com>
 Paul dG <pdesgarets@users.noreply.github.com>
+Ryuichi Watanabe <ryucrosskey@gmail.com>
+Samy Coenen <contact@samycoenen.be>
+Sandra McCann <samccann@redhat.com>
+Strix <660956+MrStrix@users.noreply.github.com>
+Sviatoslav Sydorenko <webknjaz@redhat.com>
+Thad Guidry <thadguidry@gmail.com>
+Till! <till@users.noreply.github.com>
 Timothy Appnel <tima@ansible.com>
+Traythedev <traykeller13@gmail.com>
+Yanis Guenane <yguenane@redhat.com>
 cclauss <cclauss@bluewin.ch>
+chynasan <chsander@redhat.com>
+ironfroggy <cspealma@redhat.com>
+ironfroggy <ironfroggy@gmail.com>
 jawyoonis <jamaalmohammad123@gmail.com>
+jctanner <tanner.jc@gmail.com>
+thedoubl3j <jljacks93@gmail.com>
diff --git a/update-authors.py b/update-authors.py
index 5c75a6008..30c03ae40 100755
--- a/update-authors.py
+++ b/update-authors.py
@@ -3,14 +3,16 @@
 import re
 import subprocess
 
-author_re = re.compile(r'^\s*\d+\t([\w ]+ <[^>]+>)$')
+author_re = re.compile(r'(?<=\t).*')
 
-git_log = subprocess.check_output(['git', 'shortlog', '--summary', '--email'])
+# Without the HEAD argument, git shortlog will fail when run during a pre-commit hook.
+# Thanks to Michał Górny (https://stackoverflow.com/users/165333/micha%c5%82-g%c3%b3rny)
+# for pointing this out: <https://stackoverflow.com/a/12133752/7593853>
+git_log = subprocess.check_output(['git', 'shortlog', '--summary', '--email', 'HEAD'])
 log_entries = git_log.decode('utf-8').strip().split('\n')
-authors = [author_re.match(entry).group(1) for entry in log_entries]
 
 
 print("Galaxy has been contribued to by the following authors:\n"
       "This list is automatically generated - please file an issue for corrections)\n")
-for author in authors:
-    print(author)
+for entry in log_entries:
+    print(author_re.search(entry).group(0))