diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..0eaa4eed0
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Fiona Behrens <me@kloenk.dev>
+Fiona Behrens <me@kloenk.dev> <me@kloenk.de>
diff --git a/doc/manual/change-authors.yml b/doc/manual/change-authors.yml
index bded60b8e..d5e23ba04 100644
--- a/doc/manual/change-authors.yml
+++ b/doc/manual/change-authors.yml
@@ -82,6 +82,7 @@ kjeremy:
   github: kjeremy
 
 kloenk:
+  display_name: Fiona Behrens
   forgejo: kloenk
   github: kloenk