diff --git a/.mailmap b/.mailmap
index ab1228502dc..fbcf3f3141d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@
 # See .peoplemap for unique list of people
 #
 #
+Aaron Bassett <abassett@gmail.com>
 Abhishek Lekshmanan <abhishek.lekshmanan@ril.com> <abhishek.lekshmanan@gmail.com>
 Adam Twardowski <adam.twardowski@gmail.com>
 Ahoussi Armand <ahoussi.say@telecom-bretagne.eu> <delco225>
diff --git a/.organizationmap b/.organizationmap
index ee5ac6a7cbf..d8c1929dc1a 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -366,6 +366,7 @@ The University of Arizona <contact@arizona.edu> James Ryan Cresawn <jrcresawn@gm
 Ubuntu Kylin <contact@ubuntukylin.com> Min Chen <minchen@ubuntukylin.com>
 UMCloud <contact@umcloud.com> Jiaying Ren <mikulely@gmail.com>
 UMCloud <contact@umcloud.com> Rongze Zhu <zrzhit@gmail.com>
+Unaffiliated <no@organization.net> Aaron Bassett <abassett@gmail.com>
 Unaffiliated <no@organization.net> Abhishek Dixit <dixitabhi@gmail.com>
 Unaffiliated <no@organization.net> Accela Zhao <accelazh@gmail.com>
 Unaffiliated <no@organization.net> Adam Twardowski <adam.twardowski@gmail.com>