diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..213930e9
--- /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 7d4bfcfa..898169fd 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -123,7 +123,7 @@ Contributors
 - Cédric Messiant, 2014/06/27
 - Mike Dunne, 2015/05/08
 - Josip Delić, 2016/02/16
-- Bert JW Regeer, 2016/02/16
+- Delta Regeer, 2016/02/16
 - Steve Piercy, 2016/02/19
 - Mikko Ohtamaa 2016/06/01
 - Martin Peeters 2016/10/22
diff --git a/MANIFEST.in b/MANIFEST.in
index dc06ceb5..07f15d8d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,6 +9,7 @@ include lingua.ini tox.ini
 include i18n.sh run-selenium-tests.bash
 include pyproject.toml
 include .coveragerc .isort.cfg .flake8
+include .mailmap
 exclude .readthedocs.yaml
 recursive-include deform/static *.js