diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..401f24cd60
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+# Generate AUTHORS: git log --format='%aN <%aE>' | sort -uf
+<solomon@dotcloud.com> <solomon.hykes@dotcloud.com>
+<proppy@google.com> <proppy@aminche.com>
+Aanand Prasad <aanand.prasad@gmail.com>
+Ben Firshman <ben@firshman.co.uk>
+John Hopper <john.hopper@jpserver.net>
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000000..b5676d2bc0
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,7 @@
+Aanand Prasad <aanand.prasad@gmail.com>
+Ben Firshman <ben@firshman.co.uk>
+Brendan Burns <bburns@google.com>
+fermayo <fermayo@gmail.com>
+John Hopper <john.hopper@jpserver.net>
+Johan Euphrosine <proppy@google.com>
+Solomon Hykes <solomon@docker.com>