diff --git a/.gitignore b/.gitignore
index 31ac33df19..f8629bdba5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ vc*.pdb
 rs_state.ini
 config.log
 
+!.mailmap
 !.gitignore
 !.cvsignore
 !.splintrc
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..0dfd6ec5cc
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,5 @@
+Daria Phoebe Brashear <shadow@andrew.cmu.edu>
+Daria Phoebe Brashear <shadow@dementia.org>
+Daria Phoebe Brashear <shadow@dementix.org>
+Daria Phoebe Brashear <shadow@gmail.com>
+Daria Phoebe Brashear <shadow@your-file-system.com>