diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..213930e
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Delta Regeer <xistence@0x58.com> <bertjw@regeer.org>
+Delta Regeer <xistence@0x58.com> <xistence@0x58.com>
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 8cd4bbd..8d4e133 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -106,7 +106,7 @@ Contributors
 ------------
 
 - Michael Merickel (2016-10-21)
-- Bert JW Regeer (2017-05-17)
+- Delta Regeer (2017-05-17)
 - Jens Carl (2017-05-22)
 - Eric Atkin (2019-02-15)
 - Yeray Díaz Díaz (2019-10-03)
diff --git a/MANIFEST.in b/MANIFEST.in
index ff1621b..f1c8529 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -14,6 +14,7 @@ include pyproject.toml
 include setup.cfg
 include .coveragerc
 include .flake8
+include .mailmap
 include tox.ini
 include pytest.ini
 include .readthedocs.yaml