diff --git a/.gitconfig b/.gitconfig
index 8f008ee..270865e 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,6 @@
 [user]
 	name = Quinn
-	email = quinnthepigeon@proton.me
+	email = quinn@thepigeongenerator.xyz
 	signingkey = 47378BDBE5E29830
 [tag]
 	gpgSign = true
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..ff66e61
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Quinn <quinn@thepigeongenerator.xyz> <quinnthepigeon@gmail.com>
+Quinn <quinn@thepigeongenerator.xyz> <quinnthepigeon@proton.me>
diff --git a/.stow-local-ignore b/.stow-local-ignore
index b4ebd12..600a47d 100644
--- a/.stow-local-ignore
+++ b/.stow-local-ignore
@@ -1,4 +1,5 @@
 \.git
 \.gitmodules
+\.mailmap
 LICENSE
 README\.md