diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..4a15901
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,14 @@
+# Copyright (C) 2018-present Arctic Ice Studio <development@arcticicestudio.com>
+# Copyright (C) 2018-present Sven Greb <development@svengreb.de>
+#
+# Project:    Styleguide JavaScript
+# Repository: https://github.com/arcticicestudio/styleguide-javascript
+# License:    MIT
+
+# Configuration for Git mail mapping feature to coalesce together commits by the same person in the shortlog,
+# where their name and/or email address was spelled differently.
+#
+# References:
+#   https://git-scm.com/docs/git-shortlog#_mapping_authors
+Arctic Ice Studio <development@arcticicestudio.com>
+Sven Greb <development@svengreb.de>