diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..89285586
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+Stephen J Day <stephen.day@docker.com>  Stephen Day <stevvooe@users.noreply.github.com>
+Stephen J Day <stephen.day@docker.com>  Stephen Day <stevvooe@gmail.com>
+Olivier Gambier <olivier@docker.com>    Olivier Gambier <dmp42@users.noreply.github.com>
+Brian Bland <brian.bland@docker.com>    Brian Bland <r4nd0m1n4t0r@gmail.com>
\ No newline at end of file
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 00000000..842a13bf
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,8 @@
+Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
+Andrey Kostov <kostov.andrey@gmail.com>
+Anton Tiurin <noxiouz@yandex.ru>
+Arnaud Porterie <arnaud.porterie@docker.com>
+Brian Bland <brian.bland@docker.com>
+Josh Hawn <josh.hawn@docker.com>
+Olivier Gambier <olivier@docker.com>
+Stephen J Day <stephen.day@docker.com>
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..d853daca
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+# This project makefile is around for generating peices of documentation and
+# code. For most purposes, running it is not necessary.
+
+.PHONY: clean
+.DEFAULT: default
+
+default:
+	@echo Please read the make targets before using this Makefile. It is \
+	    currently only used for documentation and autogenerated files.
+
+AUTHORS: .mailmap .git/ORIG_HEAD .git/FETCH_HEAD .git/HEAD
+	 git log --format='%aN <%aE>' | sort -fu >> $@
+
+clean:
+	rm -rf AUTHORS
\ No newline at end of file