diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000000..50a6fb4ec8
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,27 @@
+List of CodeMirror contributors. Updated before every release.
+
+Alistair Braidwood
+Aparajita Fishman
+Arian Stolwijk
+Artem Govorov
+Brandon Mills
+Charles Hughes
+Conrad Irwin
+David Bonnet
+impinball
+Ingvar Stepanyan
+Jiaxing Wang
+Johannes Herr
+Jürg Lehni
+keeyipchan
+krator
+Marijn Haverbeke
+Martin Carlberg
+Mathias Bynens
+Mathieu 'p01' Henri
+Mihai Bazon
+Oskar Schöldström
+Paul Harper
+Peter Rust
+PlNG
+zsjforcn
diff --git a/LICENSE b/LICENSE
index fb45b94c78..d4c7fc5838 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2012-2014 by Marijn Haverbeke <marijnh@gmail.com>
+Copyright (C) 2012-2014 by various contributors (see AUTHORS)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/bin/update_authors.sh b/bin/update_authors.sh
new file mode 100755
index 0000000000..466c8db586
--- /dev/null
+++ b/bin/update_authors.sh
@@ -0,0 +1,6 @@
+# Combine existing list of authors with everyone known in git, sort, add header.
+tail --lines=+3 AUTHORS > AUTHORS.tmp
+git log --format='%aN' | grep -v abraidwood >> AUTHORS.tmp
+echo -e "List of Acorn contributors. Updated before every release.\n" > AUTHORS
+sort -u AUTHORS.tmp >> AUTHORS
+rm -f AUTHORS.tmp