diff --git a/Makefile.in b/Makefile.in
index a904c51..bb5e6a6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -159,3 +159,6 @@ configure: configure.ac
 .c.o:
 	$(CC) $(CFLAGS) -o $@ -c $<
 
+.PHONY:
+doc/AUTHORS:
+	./genauthors *.c
diff --git a/doc/AUTHORS b/doc/AUTHORS
index 3190aca..f2e23bd 100644
--- a/doc/AUTHORS
+++ b/doc/AUTHORS
@@ -2,13 +2,19 @@ This is an attempt at a list of people who have made significant
 contributions to the code.  If you have been unintentionally omitted
 please let one of the team members know.
 
+Alexi Volkov <alexi@myrealbox.com>
 Erik Forsberg <forsberg@cendio.se>
+GuoJunBo <guojunbo@ict.ac.cn>
+Henrik Andersson <hean01@cendio.se> for Cendio AB
 Hugo Trippaers <spark@ision.nl>
 Jay Sorg <j@american-data.com>
+Jeremy Meng <void.foo@gmail.com>
 Jeroen Meijer <jeroen@oldambt7.com>
-Matt Chapman <matthewc@cse.unsw.edu.au>
-Michael Gernoth <michael@gernoth.net>
+Matrox Graphics Inc.
+Matthew Chapman <matthewc.unsw.edu.au>
+Michael Gernoth <mike@zerfleddert.de>
 Michal Mihalik <mmihalik@sme.sk>
 Norbert Federa <nob@thinstuff.com>
+Peter Astrand <astrand@cendio.se> for Cendio AB
 Peter Kallden <peter.kallden@ub.oru.se>
-Peter Åstrand <astrand@cendio.se>
+Pierre Ossman <ossman@cendio.se> for Cendio AB
diff --git a/genauthors b/genauthors
new file mode 100755
index 0000000..ab85873
--- /dev/null
+++ b/genauthors
@@ -0,0 +1,58 @@
+#!/usr/bin/env python
+# -*-mode: python; coding: utf-8 -*-
+
+import re
+import sys
+
+# Filled in with historical authors which are not mentioned in the source
+authors = {
+    "Hugo Trippaers <spark@ision.nl>": 1,
+    "Michal Mihalik <mmihalik@sme.sk>": 1,
+    "Norbert Federa <nob@thinstuff.com>": 1,
+    "Peter Kallden <peter.kallden@ub.oru.se>": 1,
+    }
+
+
+def dostatement(s):
+    # Get rid of (C)
+    s = re.sub('\(C\)', '', s).strip()
+
+    # Get rid of years
+    s = re.sub('\d\d\d\d(-\d\d\d\d)?', '', s).strip()
+
+    # Get rid of in-code statements
+    if s.find('"') != -1:
+        return
+
+    global authors
+    authors[s] = 1
+
+
+def dofile(fname):
+    f = open(fname)
+    pt = re.compile('\sCopyright (.*)')
+    for line in f:
+        m = pt.search(line)
+        if m != None:
+            dostatement(m.group(1).strip())
+
+
+def main():
+    for fname in sys.argv[1:]:
+        dofile(fname)
+
+    print """This is an attempt at a list of people who have made significant
+contributions to the code.  If you have been unintentionally omitted
+please let one of the team members know.
+"""
+
+    keys = authors.keys()
+    keys.sort()
+    for k in keys:
+        print k
+
+
+
+
+
+main()