diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..b196daf
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Lukas Fleischer <lfleischer@calcurse.org> Lukas Fleischer <calcurse@cryptocrack.de>
diff --git a/AUTHORS b/AUTHORS
index 621302f..27eeeb2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,2 @@
 Frederic Culot <frederic@culot.org>
-Lukas Fleischer <calcurse@cryptocrack.de>
+Lukas Fleischer <lfleischer@calcurse.org>
diff --git a/doc/calcurse.1.txt b/doc/calcurse.1.txt
index 78dbae1..367729f 100644
--- a/doc/calcurse.1.txt
+++ b/doc/calcurse.1.txt
@@ -488,7 +488,7 @@ Authors
 -------
 
 * *Frederic Culot* <frederic@culot.org>
-* *Lukas Fleischer* <calcurse@cryptocrack.de>
+* *Lukas Fleischer* <lfleischer@calcurse.org>
 
 Copyright
 ---------
diff --git a/doc/submitting-patches.txt b/doc/submitting-patches.txt
index 0241492..2807ad1 100644
--- a/doc/submitting-patches.txt
+++ b/doc/submitting-patches.txt
@@ -120,7 +120,7 @@ case there are any errors during import) failing.
 Fix this by calling vars_init() before io_import_data().
 
 Reported-by: Andraž 'ruskie' Levstik <ruskie@codemages.net>
-Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
+Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
 ----
 
 The `-s` in the `git commit` invocation makes Git add a "Signed-off-by" line to