diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..a276eb4c
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,9 @@
+Alexander Täschner <taschnataschna@uni-muenster.de>
+Anders Gustafsson <anders@cureos.com>
+Andriy Bratiychuk <basic2003@list.ru>
+Gauthier Segay <gauthier.segay@gmail.com> <gauthier@t420s.local>
+manyue <manyue.mo@gmail.com> <manyue@someemail.com>
+manyue <manyue.mo@gmail.com> <Mo@DDBNXBB1.(none)>
+Paul Varkey <paul.varkey@gmail.com>
+Phil Cleveland <pdoh00@gmail.com>
+Thomas Ibel <tibel@users.noreply.github.com> <tibel@codeplex.fake>
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 01a880cf..0b7eca39 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,7 +1,7 @@
 Math.NET Numerics Contributors
 ==============================
 
-The Math.NET project is a community effort. We accept contributions and pull requests, but other support like submitting issues or helping the community are just as valuable. Why don't you join us as well? 
+The Math.NET project is a community effort. We accept contributions and pull requests, but other support like submitting issues or helping the community are just as valuable. Why don't you join us as well?
 
 **Thanks for all the contributions!**
 
@@ -15,40 +15,40 @@ The Math.NET project is a community effort. We accept contributions and pull req
 Feel free to add a link to your personal site/blog and/or twitter handle.*
 
 - [Christoph Rüegg](http://christoph.ruegg.name/) (@cdrnet)
-- [Marcus Cuda](http://marcuscuda.com/)
+- [Marcus Cuda](http://marcuscuda.com/) (@marcuscuda)
 - Jurgen Van Gael (@jvangael)
-- Alexander Karatarakis (Danimoth)
-- Thomas Ibel (tibel)
+- Alexander Karatarakis
+- Thomas Ibel
 - Gustavo Guerra
+- Alexander Täschner
 - Hani Medhat
 - manyue
-- Alexander Täschner (taschna)
 - David Prince
-- Andriy Bratiychuk (Abratiychuk)
+- Andriy Bratiychuk
 - Jack Pappas
 - Artyom Baranovskiy
-- Phil Cleveland (Phil)
+- Phil Cleveland
 - Scott Stephens
 - Superbest
+- Anders Gustafsson
+- Gauthier Segay
 - Patrick van der Velde
 - Robin Neatherway
-- Anders Gustafsson (cureos)
-- Gauthier Segay (gauthier)
 - Andrew Kazyrevich
 - Candy Chiu
 - Ethar Alali
-- Iain McDonald (lifebeyondfife)
+- Iain McDonald
 - Gregor959
 - IUser
 - Iain Sproat
-- Kosei ABE (kos59125)
+- Kosei ABE
 - Martin Posch
+- Paul Varkey
 - Till Hoffmann
 - Tomas Petricek
 - VicPara
 - bstrausser
 - nyuriks
-- Paul Varkey
 - seahearman
 
 ### Indirect Code Contributors