diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000000000000000000000000000000000..dd9c3fd91e92865fc8f7cbce49fac318fc7012f0
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Beth Rennie <beth@brennie.ca> <barret.rennie@gmail.com>
+Beth Rennie <beth@brennie.ca> <barret@beanbaginc.com>
+Beth Rennie <beth@brennie.ca> <barret@brennie.ca>
diff --git a/AUTHORS b/AUTHORS
index 8db751dac59a96f6623aeed9677e88acad1966fa..04f8e3a3a65953f6a6945c509a2192ffe91c99d1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,8 +11,8 @@ Contributors:
 	* Andrew Grigorev
 	* Anthony Mok
 	* Azad Salahli
-	* Barret Rennie
 	* Ben Hollis
+	* Beth Rennie
 	* Brad Taylor
 	* Carlos Corrales
 	* Cory McWilliams
diff --git a/docs/releasenotes/0.10-beta-1.rst b/docs/releasenotes/0.10-beta-1.rst
index 376392d2fddc5848c3f3429a922f7ff8448229cd..924b7b033f7589577ecf1243ba3ad178dc365ce1 100644
--- a/docs/releasenotes/0.10-beta-1.rst
+++ b/docs/releasenotes/0.10-beta-1.rst
@@ -398,7 +398,7 @@ djblets.webapi
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
 * David Trowbridge
 * John Larmie
diff --git a/docs/releasenotes/0.10-beta-2.rst b/docs/releasenotes/0.10-beta-2.rst
index 4236009fc3a71e35871221293ad8b9ab66cb2b53..3305c0db924f7acd959e0ca891e2174489b46fd8 100644
--- a/docs/releasenotes/0.10-beta-2.rst
+++ b/docs/releasenotes/0.10-beta-2.rst
@@ -333,7 +333,7 @@ jquery.gravy.util
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
 * David Trowbridge
 * Michael Udaltsov
diff --git a/docs/releasenotes/0.8.14.rst b/docs/releasenotes/0.8.14.rst
index f9d93317a2b8155062bd22a27d4fb2a763d80a5e..4f3eee9ee65fa6c4155c156d5330ef41084dbe3d 100644
--- a/docs/releasenotes/0.8.14.rst
+++ b/docs/releasenotes/0.8.14.rst
@@ -53,7 +53,7 @@ djblets.db
 * :py:class:`RelationCounterField` now has a default value for
   ``rel_field_name``, allowing it to be used in a database evolution.
 
-  Patch by Barret Rennie.
+  Patch by Beth Rennie.
 
 
 djblets.extensions
@@ -102,7 +102,7 @@ djblets.urls.resolvers
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
 * David Trowbridge
 * Justin Maillet
diff --git a/docs/releasenotes/0.8.22.rst b/docs/releasenotes/0.8.22.rst
index f4744d1d5841f261f2c9060c1d93d715277616ce..fcc0b4662ceac27814817978609cc0d7da8b58c2 100644
--- a/docs/releasenotes/0.8.22.rst
+++ b/docs/releasenotes/0.8.22.rst
@@ -63,5 +63,5 @@ djblets.testing
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
diff --git a/docs/releasenotes/0.8.23.rst b/docs/releasenotes/0.8.23.rst
index e94ab0429128ec861772553175e672c68f2a1313..973cd1c13fc779c3a6ed06697dbdd4dd55ad14f1 100644
--- a/docs/releasenotes/0.8.23.rst
+++ b/docs/releasenotes/0.8.23.rst
@@ -21,5 +21,5 @@ djblets.webapi
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * David Trowbridge
diff --git a/docs/releasenotes/0.8.24.rst b/docs/releasenotes/0.8.24.rst
index f4d9662cfcdfd8ae71bbde4b9f93ef8265a3aea2..aa8536ae161bf38e64ea68f85d95aeed3ec9c782 100644
--- a/docs/releasenotes/0.8.24.rst
+++ b/docs/releasenotes/0.8.24.rst
@@ -58,7 +58,7 @@ djblets.util
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
 * David Trowbridge
 * Weijie Sun
diff --git a/docs/releasenotes/0.8.26.rst b/docs/releasenotes/0.8.26.rst
index 367d5a1e787e7799ff52b3875111c64bc905a4d4..cf05d222afc239a4af380c77fefc9229150872fe 100644
--- a/docs/releasenotes/0.8.26.rst
+++ b/docs/releasenotes/0.8.26.rst
@@ -53,7 +53,7 @@ djblets.extensions
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
 * David Trowbridge
 * Horatiu Eugen Vlad
diff --git a/docs/releasenotes/0.8.27.rst b/docs/releasenotes/0.8.27.rst
index a3fce7f3498436c57db4bf22bef2cb9c807e9fc3..3efdc5ffa9eea1086ea3f2a4922d581c3f79a53e 100644
--- a/docs/releasenotes/0.8.27.rst
+++ b/docs/releasenotes/0.8.27.rst
@@ -86,5 +86,5 @@ djblets.siteconfig
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
diff --git a/docs/releasenotes/0.8.29.rst b/docs/releasenotes/0.8.29.rst
index 2159e7dc05337329f93962842210c4f9f4310589..3d84d6a4edc82e36d41e7192971f143420287dec 100644
--- a/docs/releasenotes/0.8.29.rst
+++ b/docs/releasenotes/0.8.29.rst
@@ -36,5 +36,5 @@ djblets.testing
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
diff --git a/docs/releasenotes/0.9.1.rst b/docs/releasenotes/0.9.1.rst
index bdfba374e471ae06f2d03bdf7ac10b8b70ff2bed..25d3a92fa8c08550a91fa4b1781e6ed46a0f0c96 100644
--- a/docs/releasenotes/0.9.1.rst
+++ b/docs/releasenotes/0.9.1.rst
@@ -58,5 +58,5 @@ djblets.util
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Weijie Sun
diff --git a/docs/releasenotes/0.9.3.rst b/docs/releasenotes/0.9.3.rst
index 1abfba43c328b8ed4cdb0c7025cd862f6cc4d770..114e1c23c8ffceedf450addef3977e9e7e3c0ab1 100644
--- a/docs/releasenotes/0.9.3.rst
+++ b/docs/releasenotes/0.9.3.rst
@@ -64,7 +64,7 @@ JavaScript
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
 * David Trowbridge
 * Horatiu Eugen Vlad
diff --git a/docs/releasenotes/0.9.4.rst b/docs/releasenotes/0.9.4.rst
index 3349ae3e4a5af90f3530ceffce319c13ad7f2784..4854211ed59dbf0918f959d73bdd946ba5addd82 100644
--- a/docs/releasenotes/0.9.4.rst
+++ b/docs/releasenotes/0.9.4.rst
@@ -127,7 +127,7 @@ djblets.webapi
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
 * David Trowbridge
 * Griffin Myers
diff --git a/docs/releasenotes/0.9.6.rst b/docs/releasenotes/0.9.6.rst
index 38ee268cac08cf72810345cec817b0823011890f..e213370509e25ef3d5fbb08ec2411947b24f6d32 100644
--- a/docs/releasenotes/0.9.6.rst
+++ b/docs/releasenotes/0.9.6.rst
@@ -36,5 +36,5 @@ djblets.testing
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
diff --git a/docs/releasenotes/0.9.7.rst b/docs/releasenotes/0.9.7.rst
index ef22514ceb2f3c4df170d782244c20bed326eac6..49f6cbbee61648eb58bdf80019d50a52b1493065 100644
--- a/docs/releasenotes/0.9.7.rst
+++ b/docs/releasenotes/0.9.7.rst
@@ -70,5 +70,5 @@ JavaScript
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
diff --git a/docs/releasenotes/0.9.9.rst b/docs/releasenotes/0.9.9.rst
index 11bee27bd66eb22a27b4aa526dd7c99589e1153a..c91e1234a306586ff96433d6f74ccb8ebbca742c 100644
--- a/docs/releasenotes/0.9.9.rst
+++ b/docs/releasenotes/0.9.9.rst
@@ -45,6 +45,6 @@ djblets.webapi
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
 * David Trowbridge
diff --git a/docs/releasenotes/0.9.rst b/docs/releasenotes/0.9.rst
index 7af6085f1f1698608c39dc9288430d01d08c8a8b..7bb9f488398e568782eed01f0c8e958e9c0cf8b0 100644
--- a/docs/releasenotes/0.9.rst
+++ b/docs/releasenotes/0.9.rst
@@ -403,7 +403,7 @@ djblets.webapi
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
 * David Trowbridge
 * Griffin Myers
diff --git a/docs/releasenotes/1.0-rc-1.rst b/docs/releasenotes/1.0-rc-1.rst
index 85766708320434491fcfdfcd60733b75bd923e9b..ab91e0298679fa7ed70410e462bf22a405936dfb 100644
--- a/docs/releasenotes/1.0-rc-1.rst
+++ b/docs/releasenotes/1.0-rc-1.rst
@@ -201,5 +201,5 @@ LessCSS
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
diff --git a/docs/releasenotes/1.0.2.rst b/docs/releasenotes/1.0.2.rst
index d9f83fa3929da6d36bcd3be47c152862857a011a..24e6e9d58026443facdcfe00d2567d84617a247f 100644
--- a/docs/releasenotes/1.0.2.rst
+++ b/docs/releasenotes/1.0.2.rst
@@ -72,5 +72,5 @@ Style Sheets
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
diff --git a/docs/releasenotes/1.0.4.rst b/docs/releasenotes/1.0.4.rst
index 5ee6414a36a6c9e397a72b1f9170686975bef170..6e9f9aeb0cfcd8f7443dc31bbbc82a3b4f1e4eb6 100644
--- a/docs/releasenotes/1.0.4.rst
+++ b/docs/releasenotes/1.0.4.rst
@@ -85,6 +85,6 @@ JavaScript
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
 * David Trowbridge
diff --git a/docs/releasenotes/1.0.6.rst b/docs/releasenotes/1.0.6.rst
index ac5e805be701c1ee072d10efc696e61ba4a8d1ae..71abe345ed693f6da992cb2f3d8a587e8d7d19db 100644
--- a/docs/releasenotes/1.0.6.rst
+++ b/docs/releasenotes/1.0.6.rst
@@ -152,6 +152,6 @@ Style Sheets
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
 * David Trowbridge
diff --git a/docs/releasenotes/1.0.7.rst b/docs/releasenotes/1.0.7.rst
index f0a2925eb2dd35e5cb5c590a80b76a186609fcab..fd1d57a9c1fc57ae64584a824b2fa126f796f0d9 100644
--- a/docs/releasenotes/1.0.7.rst
+++ b/docs/releasenotes/1.0.7.rst
@@ -52,5 +52,5 @@ djblets.webapi
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
diff --git a/docs/releasenotes/1.0.rst b/docs/releasenotes/1.0.rst
index a10110eec71acb0a8e849bcb13b5b4f4f5c5c1fd..dd31a541914bf2bcf37880721bc8c2fa2709ae3a 100644
--- a/docs/releasenotes/1.0.rst
+++ b/docs/releasenotes/1.0.rst
@@ -739,7 +739,7 @@ djblets.extensions
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
 * David Trowbridge
 * John Larmie
diff --git a/docs/releasenotes/2.0.rst b/docs/releasenotes/2.0.rst
index a4244ab3db975979bbb575284defdb595ffbac66..f5b5d4ac5dd1b8aa3b4b9c64d005a41443566068 100644
--- a/docs/releasenotes/2.0.rst
+++ b/docs/releasenotes/2.0.rst
@@ -164,7 +164,7 @@ djblets.db
 * Fixed a rare infinite recursion issue in
   :py:class:`~djblets.db.fields.counter_field.CounterField`.
 
-  Patch by Barret Rennie.
+  Patch by Beth Rennie.
 
 * Removed the deprecated ``encoder`` argument in the
   :py:class:`~djblets.db.fields.json_field.JSONField` constructor, in favor
@@ -418,7 +418,7 @@ djblets.webapi
 Contributors
 ============
 
-* Barret Rennie
+* Beth Rennie
 * Christian Hammond
 * David Trowbridge
 * Hailan Xu
