diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000000000000000000000000000000000..c460b4eeb3e0adb2069d8508a30c0facf536acd2
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,14 @@
+Thomas Kloss <kloss@itp.uni-frankfurt.de>
+<joseph@weston.cloud> <joseph.weston08@gmail.com>
+<joseph@weston.cloud> <joseph.weston@cea.fr>
+<joseph@weston.cloud> <me@josephweston.org>
+Tómas Örn Rosdahl <torosdahl@gmail.com>
+<slavoutich@ostroukh.me> <ostroukh@lorentz.leidenuniv.nl>
+<m.t.wimmer@tudelft.nl> <wimmer@lorentz.leidenuniv.nl>
+Christoph W. Groth <christoph.groth@cea.fr>
+Dániel Varjas <dvarjas@gmail.com>
+Pablo Pérez Piskunow <pablo.perez.piskunow@gmail.com>
+Michał Nowak <albeercik@gmail.com>
+Paul Clisson <clissonpaul@gmail.com>
+Jörg Behrmann <behrmann@physik.fu-berlin.de>
+Rafał Skolasiński <r.j.skolasinski@gmail.com>
diff --git a/AUTHORS.rst b/AUTHORS.rst
index d41a7864573ffc8d0134861f60f7d31998372fa3..68311358a4208c3cf482e3facec340e0f46c1013 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -8,7 +8,7 @@ The principal developers of Kwant are
 
 * `Christoph W. Groth <mailto:christoph.groth@cea.fr>`_ (CEA Grenoble)
 * `Michael Wimmer <https://michaelwimmer.org>`_ (TU Delft)
-* `Anton R. Akhmerov <http://antonakhmerov.org>`_ (TU Delft)
+* `Anton Akhmerov <http://antonakhmerov.org>`_ (TU Delft)
 * `Xavier Waintal <http://inac.cea.fr/Pisp/xavier.waintal>`_ (CEA Grenoble)
 * `Joseph Weston <http://josephweston.org>`_ (TU Delft)
 
@@ -27,6 +27,8 @@ Contributors to Kwant include
 * Rafał Skolasiński (TU Delft)
 * Adrien Sorgniard (CEA Grenoble)
 * Dániel Varjas (TU Delft)
+* Thomas Kloss (CEA Grenoble)
+* Pierre Carmier (CEA Grenoble)
 
 We thank Christoph Gohlke for the creation of installers for Microsoft Windows.