diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..e04e898
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,31 @@
+Markus Hitter <mah@jump-ing.de>
+
+Michael Moon <triffid.hunter@gmail.com> triffid <triffid.hunter@gmail.com>
+
+Nico Tonnhofer <wurstnase.reprap@gmail.com> wurstnase <wurstnase.reprap@gmail.com>
+Nico Tonnhofer <wurstnase.reprap@gmail.com> Wurstnase <wurstnase.reprap@gmail.com>
+
+Phil Hord <phord@purestorage.com> Phil Hord <phil.hord@technicolor.com>
+Phil Hord <phord@purestorage.com> Phil Hord <hordp@cisco.com>
+
+Jeff Bernardis <jeff.bernardis@gmail.com> jbernardis <jeff.bernardis@gmail.com>
+
+Markus Amsler <markus.amsler@oribi.org> Markus Amsler <markus.amsler@gmail.com>
+
+David Forrest <drf@vims.edu>
+
+Jim McGee <madscifi@jetblackcat.com>
+
+Ben Jackson <ben@ben.com>
+
+Robert Konklewski <nythil@gmail.com>
+
+Bas Laarhoven <sjml@xs4all.nl>
+
+Stephan Walter <stephan@walter.name>
+
+Ruslan Popov <ruslan.popov@gmail.com>
+
+Jens Ch. Restemeier <jens.restemeier@gmail.com>
+
+Roland Brochard <zuzuf86@gmail.com>
diff --git a/configtool/gui.py b/configtool/gui.py
index b64af22..2202ccd 100644
--- a/configtool/gui.py
+++ b/configtool/gui.py
@@ -657,28 +657,27 @@ class ConfigFrame(wx.Frame):
 
     def onAbout(self, evt):
         # Get the contributors' top 10 with something like this:
-        #   export B=experimental
-        #   git log $B | grep "Author:" | sort | uniq | while \
-        #     read A; do N=$(git log $B | grep "$A" | wc -l); echo "$N $A"; done | \
-        #     sort -rn
+        #   git shortlog experimental -sne | perl -ne \
+        #      '/([0-9]+)\s*(.*)\s*(\<.*)/g && \
+        #       printf  "\n%12s\"    %s (%d commits)\\n\"", "", $2, $1;
+        #
+        # Most recent commiters are in the .mailmap
         self.message(
             "Teacup Firmware is a 3D Printer and CNC machine controlling "
             "firmware with emphasis on performance, efficiency and "
             "outstanding quality. What Teacup does, shall it do very well."
             "\n\n\n"
             "Lots of people hard at work! Top 10 contributors:\n\n"
-            "    Markus Hitter (542 commits)\n"
-            "    Michael Moon (322 commits)\n"
-            "    Phil Hord (55 commits)\n"
-            "    Jeff Bernardis (51 commits)\n"
-            "    Markus Amsler (47 commits)\n"
-            "    David Forrest (27 commits)\n"
-            "    Jim McGee (15 commits)\n"
-            "    Ben Jackson (12 commits)\n"
-            "    Bas Laarhoven (10 commits)\n"
-            "    Stephan Walter (9 commits)\n"
-            "    Roland Brochard (3 commits)\n"
-            "    Jens Ch. Restemeier (3 commits)\n",
+            "    Markus Hitter  (870 commits)\n"
+            "    Michael Moon  (325 commits)\n"
+            "    Nico Tonnhofer  (164 commits)\n"
+            "    Phil Hord  (117 commits)\n"
+            "    Jeff Bernardis  (55 commits)\n"
+            "    Markus Amsler  (48 commits)\n"
+            "    David Forrest  (27 commits)\n"
+            "    Jim McGee  (15 commits)\n"
+            "    Ben Jackson  (12 commits)\n"
+            "    Robert Konklewski  (12 commits)\n"
             "About Teacup",
             style=wx.OK,
         )