diff --git a/.mailmap b/.mailmap
index fed81f1ee19..202998756dc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -40,6 +40,7 @@ Dominik Hannen <cantares1+github@gmail.com> Dominik Hannen <dhxgit@users.noreply
 Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
 Erwin, Brock A <Brock.Erwin@pnl.gov> <Brock.Erwin@pnl.govgit>
 Esteban Molina-Estolano <eestolan@lanl.gov> eestolan <eestolan@29311d96-e01e-0410-9327-a35deaab8ce9>
+François Lafont <flafdivers@free.fr> François Lafont <francois.lafont@crdp.ac-versailles.fr>
 Florent Bautista <florent@coppint.com> FlorentCoppint <florent@coppint.com>
 Florent Flament <florent.flament@cloudwatt.com> <florent.flament-ext@cloudwatt.com>
 Gary Lowell <gary.lowell@inktank.com> Gary Lowelll <gary.lowell@inktank.com>
diff --git a/.organizationmap b/.organizationmap
index cd2cf8c643f..a9fbbaac662 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -198,6 +198,7 @@ Unaffiliated <no@organization.net> Colin Mattson <colinmattson@gmail.com>
 Unaffiliated <no@organization.net> Dan Chai <tengweicai@gmail.com>
 Unaffiliated <no@organization.net> Dominik Hannen <cantares1+github@gmail.com>
 Unaffiliated <no@organization.net> Florent Bautista <florent@coppint.com>
+Unaffiliated <no@organization.net> François Lafont <flafdivers@free.fr>
 Unaffiliated <no@organization.net> Huang Jun <hjwsm1989@gmail.com>
 Unaffiliated <no@organization.net> Kevin Cox <kevincox@kevincox.ca>
 Unaffiliated <no@organization.net> koleosfuscus <koleosfuscus@yahoo.com>