diff --git a/.mailmap b/.mailmap
index d4a13b400..e8e641ce1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,15 +10,19 @@ Amar Tumballi <amarts@redhat.com> <amar@gluster.com> <amar@del.gluster.com>
 Anand Avati <avati@redhat.com> <avati@gluster.com> <avati@dev.gluster.com> <avati@amp.gluster.com> <avati@blackhole.gluster.com>
 Anush Shetty <ashetty@redhat.com> <anush@gluster.com>
 Csaba Henk <csaba@redhat.com> <csaba@gluster.com> <csaba@lowlife.hu> <csaba@zresearch.com>
+Günther Deschner <gd@redhat.com> <gd@samba.org>
 Harshavardhana <fharshav@redhat.com> <harsha@gluster.com> <harsha@zresearch.com> <harsha@dev.gluster.com> <harsha@harshavardhana.net>
 Justin Clift <justin@gluster.org> <jclift@redhat.com>
-Kaleb S. KEITHLEY <kkeithle@redhat.com> <kkeithle@f16node1.kkeithle.usersys.redhat.com>
+Kaleb S. KEITHLEY <kkeithle@redhat.com> <kkeithle@f16node1.kkeithle.usersys.redhat.com> <kkeithle@linux.keithley.org>
 Kaushal M <kaushal@redhat.com> <kaushal@gluster.com>
 Kaushik BV <kbudiger@redhat.com> <kaushikbv@gluster.com>
 Krishna Srinivas <ksriniva@redhat.com> <krishna@gluster.com> <krishna@zresearch.com> <krishna@guest-laptop>
 Krishnan Parthasarathi <kparthas@redhat.com> <kp@gluster.com>
 Louis Zuckerman <louiszuckerman@gmail.com> <me@louiszuckerman.com>
 M S Vishwanath Bhat <vbhat@redhat.com> <msvbhat@gmail.com> <vishwanath@gluster.com>
+Michael Adam <madam@redhat.com> <obnox@samba.org>
+Oleksandr Natalenko <oleksandr@natalenko.name> <o.natalenko@lanet.ua>
+Patrick Uiterwijk <puiterwijk@fedoraproject.org> <patrick@puiterwijk.org>
 Pavan Sondur <pavan@gluster.com> <pavan@dev.gluster.com>
 Pete Zaitcev <zaitcev@kotori.zaitcev.us> <zaitcev@yahoo.com>
 Pranith Kumar K <pkarampu@redhat.com> <pranithk@gluster.com>
@@ -27,9 +31,12 @@ Raghavendra Bhat <raghavendra@redhat.com> <raghavendrabhat@gluster.com>
 Raghavendra G <rgowdapp@redhat.com> <raghavendra@gluster.com> <raghavendra@zresearch.com>
 Rahul C S <rahulcs@redhat.com> <rahulcssjce@gmail.com>
 Rajesh Amaravathi <rajesh@redhat.com> <rajesh@gluster.com> <rajesh.amaravathi@gmail.com>
+Ravishankar N <ravishankar@redhat.com> <root@ravi2.(none)>
+Sakshi Bansal <sabansal@redhat.com> <sabansal@localhost.localdomain>
 Shehjar Tikoo <shehjart@gluster.com> <shehjart@zresearch.com>
 Venky Shankar <vshankar@redhat.com> <venky@gluster.com>
 Vijay Bellur <vbellur@redhat.com> <vijay@gluster.com> <vijay@dev.gluster.com>
 Vijaykumar Koppad <vkoppad@redhat.com> <vijaykumar.koppad@gmail.com>
+Vijaikumar Mallikarjuna <vmallika@redhat.com>
 Vikas Gorur <vikas@gluster.com> <vikas@zresearch.com>
 shishir gowda <sgowda@redhat.com> <shishirng@gluster.com>
diff --git a/extras/who-wrote-glusterfs/gitdm.aliases b/extras/who-wrote-glusterfs/gitdm.aliases
index e19b99c79..1fcdda713 100644
--- a/extras/who-wrote-glusterfs/gitdm.aliases
+++ b/extras/who-wrote-glusterfs/gitdm.aliases
@@ -16,11 +16,13 @@ anush@gluster.com	ashetty@redhat.com
 csaba@gluster.com	csaba@redhat.com
 csaba@lowlife.hu	csaba@redhat.com
 csaba@zresearch.com	csaba@redhat.com
+gd@samba.org            gd@redhat.com
 harsha@gluster.com	fharshav@redhat.com
 harsha@zresearch.com	fharshav@redhat.com
 harsha@dev.gluster.com	fharshav@redhat.com
 harsha@harshavardhana.net	fharshav@redhat.com
 jclift@redhat.com       jclift@gluster.org
+kkeithle@linux.keithley.org	kkeithle@redhat.com
 kkeithle@f16node1.kkeithle.usersys.redhat.com	kkeithle@redhat.com
 kaushal@gluster.com	kaushal@redhat.com
 kaushikbv@gluster.com	kbudiger@redhat.com
@@ -32,6 +34,9 @@ me@louiszuckerman.com	louiszuckerman@gmail.com
 msvbhat@gmail.com	vbhat@redhat.com
 nullpai@gmail.com       ppai@redhat.com
 vishwanath@gluster.com	vbhat@redhat.com
+obnox@samba.org         madam@redhat.com
+oleksandr@natalenko.name        o.natalenko@lanet.ua
+patrick@puiterwijk.org  puiterwijk@fedoraproject.org
 pavan@dev.gluster.com	pavan@gluster.com
 zaitcev@yahoo.com	zaitcev@kotori.zaitcev.us
 pranithk@gluster.com	pkarampu@redhat.com
@@ -41,6 +46,8 @@ raghavendra@zresearch.com	rgowdapp@redhat.com
 rahulcssjce@gmail.com	rahulcs@redhat.com
 rajesh@gluster.com	rajesh@redhat.com
 rajesh.amaravathi@gmail.com	rajesh@redhat.com
+root@ravi2.(none)       ravishankar@redhat.com
+sabansal@localhost.localdomain  sabansal@redhat.com
 shehjart@zresearch.com	shehjart@gluster.com
 venky@gluster.com	vshankar@redhat.com
 vijay@gluster.com	vbellur@redhat.com
diff --git a/extras/who-wrote-glusterfs/gitdm.domain-map b/extras/who-wrote-glusterfs/gitdm.domain-map
index 39526f0f9..d9ea7f235 100644
--- a/extras/who-wrote-glusterfs/gitdm.domain-map
+++ b/extras/who-wrote-glusterfs/gitdm.domain-map
@@ -2,15 +2,26 @@
 # Here is a set of mappings of domain names onto employer names.
 #
 active.by       ActiveCloud
+appeartv.com    Appear TV
 cern.ch         CERN
+datalab.es      DataLab S.L.
+fb.com          Facebook
+fedoraproject.org       Fedora Project
 gluster.com     Red Hat
-gmail.com       (unknown)
+gmail.com       (personal contributions)
 gooddata.com	GoodData
 hastexo.com     hastexo
+horde.com       (personal contributions)
 ibm.com		IBM
+io.com          IO
+lanet.ua        Lanet Network
 linbit.com	LINBIT
+nectec.or.th    NECTEC
 netbsd.org	NetBSD
 netdirect.ca	Net Direct
+nokia.com       Nokia
 redhat.com	Red Hat
 stepping-stone.ch       stepping stone GmbH
+xtaotech.com    XTAO Co.
+yahoo.in        (personal contributions)
 zresearch.com   Red Hat