diff --git a/.mailmap b/.mailmap
index cb0c265368b..24f0bf5c834 100644
--- a/.mailmap
+++ b/.mailmap
@@ -416,6 +416,7 @@ Jay Vora <jvo@tinyerp.com> jvo(OpenERP) <>
 Jay Vora <jvo@tinyerp.com> jvo@tinyerp.com <>
 Jay Vora (Serpent CS) <jay.vora@serpentcs.com>
 Jay Vora (Serpent CS) <jay.vora@serpentcs.com> <serpentcs.lp@gmail.com>
+Jay Vora (Serpent CS) <jay.vora@serpentcs.com> <support@serpentcs.com>
 Jaydeep Barot <jar@tinyerp.com>
 Jaydeep Barot <jar@tinyerp.com> <jar@openerp.com>
 Jaydeep Barot <jar@tinyerp.com> <jaydeep.gvp@gmail.com>
@@ -724,6 +725,7 @@ Quentin De Paoli <qdp@odoo.com> <qdp-launchpad@openerp.com>
 Quentin De Paoli <qdp@odoo.com> <qdp-launchpad@tinyerp.com>
 Quentin De Paoli <qdp@odoo.com> <qdp@openerp.com>
 Quentin De Paoli <qdp@odoo.com> <qdp@tinyerp.com>
+Quentin De Paoli <qdp@odoo.com> OpenERP <openerp@ubuntu>
 Quentin De Paoli <qdp@odoo.com> Quentin <qdp@jade>
 Quentin De Paoli <qdp@odoo.com> Quentin De Paoli <>
 Quentin De Paoli <qdp@odoo.com> Quentin De Paoli <qdp@cyan>
@@ -823,8 +825,10 @@ Rolv Råen <rolv.raen@gmail.com>
 Rolv Råen <rolv.raen@gmail.com> rora@adego.no <>
 Ronak Baxi <rba@tinyerp.com>
 Ronak Baxi <rba@tinyerp.com> Ronak Baxi <rba@openerp.com>
-Ronald Portier <ronald@therp.nl>
-Ronald Portier <ronald@therp.nl> Ronald Portier (Therp) <>
+Ronald Portier <rportier@therp.nl>
+Ronald Portier <rportier@therp.nl> Ronald Portier (Therp) <>
+Ronald Portier <rportier@therp.nl> Ronald Portier (Therp) <>
+Ronald Portier <rportier@therp.nl> <ronald@therp.nl>
 Rucha Patel <rpa@tinyerp.com>
 Rucha Patel <rpa@tinyerp.com> <rpa@openerp.co.in>
 Rucha Patel <rpa@tinyerp.com> <rpa@openerp.com>