diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000000000000000000000000000000000..d6c09c07f2b853e0000a06d12e971706eeb6720e
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: 2024, Collabora, Ltd. and the Monado contributors
+# SPDX-License-Identifier: CC0-1.0
+
+BabbleBones <BabbleBones@protonmail.com>
+Christoph Haag <christoph.haag@collabora.com>
+Christoph Haag <christoph.haag@collabora.com> <haagch+gitlab@frickel.club>
+Frederic Plourde <frederic.plourde@collabora.com>
+Jakob Bornecrantz <wallbraker@gmail.com>
+Jakob Bornecrantz <wallbraker@gmail.com> <jakob@collabora.com>
+Jan Schmidt <thaytan@noraisin.net>
+Mateo de Mayo <mateo.demayo@collabora.com>
+Moshi Turner <mosesturner@protonmail.com>
+Moshi Turner <mosesturner@protonmail.com> <moses@collabora.com>
+Rylie Pavlik <rylie.pavlik@collabora.com>
+Rylie Pavlik <rylie.pavlik@collabora.com> <ryan.pavlik@collabora.com>
+Rylie Pavlik <rylie.pavlik@collabora.com> <ryan.pavlik@gmail.com>