diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000000000000000000000000000000000..47ee18fd34f6fa1bf76a5dcd88518564c7358bf3
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: 2023-2025 Helmholtz-Zentrum hereon GmbH
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileContributor: Carsten Lemmen <carsten.lemmen@hereon.de
+
+Carsten Lemmen <carsten.lemmen@hereon.de>
+Ovidio Fernando García-Oliva <ovidio.garcia@hereon.de> og