diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..934409971f
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,15 @@
+Alari Aho <alari@toggl.com>
+Ervin Weber <ervin@toggl.com>
+Indrek Vändrik <indzuliin@gmail.com>
+Indrek Vändrik <indzuliin@gmail.com>	Indrek Vändrik <indrek@toggl.com>
+Indrek Vändrik <indzuliin@gmail.com>	Indrek Vändrik <indrekv@batman.lan>
+Indrek Vändrik <indzuliin@gmail.com>	IndrekV <indzuliin@gmail.com>
+Marcel Schaeben <mts@geraet.lan>
+Marko Burjek <s0mebody.slo@gmail.com>
+Mathias Larsen <tripox@tripox.dk>
+Sam Ford <sam@quietstuff.com>
+Tambet Masik <tambet@toggl.com>
+Tanel Lebedev <tanel.lebedev@gmail.com>
+Tanel Lebedev <tanel.lebedev@gmail.com>		Tanel Lebedev <tanellebedev@Tanels-MBP.lan>
+Tanel Lebedev <tanel.lebedev@gmail.com>		buildbot <buildbot@localhost.localdomain>
+Tanel Lebedev <tanel.lebedev@gmail.com>		= <tanel.lebedev@gmail.com>
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000000..327acd7a87
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,9 @@
+Alari Aho <alari@toggl.com>
+Ervin Weber <ervin@toggl.com>
+Indrek Vändrik <indzuliin@gmail.com>
+Marcel Schaeben <mts@geraet.lan>
+Marko Burjek <s0mebody.slo@gmail.com>
+Mathias Larsen <tripox@tripox.dk>
+Sam Ford <sam@quietstuff.com>
+Tambet Masik <tambet@toggl.com>
+Tanel Lebedev <tanel.lebedev@gmail.com>
diff --git a/update_authors.sh b/update_authors.sh
new file mode 100755
index 0000000000..901f0d7b25
--- /dev/null
+++ b/update_authors.sh
@@ -0,0 +1 @@
+git log --format="%aN <%aE>"|sort|uniq > AUTHORS