diff --git a/.mailmap b/.mailmap
index d6f2f6350914d1..a0016a58159217 100644
--- a/.mailmap
+++ b/.mailmap
@@ -123,6 +123,9 @@ Eric Phetteplace <phette23@gmail.com>
 Ernesto Salazar <ernestoalbertosalazar@gmail.com>
 Erwin W. Ramadhan <erwinwahyuramadhan@gmail.com>
 Eugene Obrezkov <ghaiklor@gmail.com>
+Eugene Ostroukhov <eostroukhov@google.com> <eostroukhov@chromium.org>
+Eugene Ostroukhov <eostroukhov@google.com> <eostroukhov@gmail.com>
+Eugene Ostroukhov <eostroukhov@google.com> <eostroukhov@netflix.com>
 EungJun Yi <semtlenori@gmail.com>
 Evan Larkin <evan.larkin.il.com> <evan.larkin.iit@gmail.com>
 Evan Lucas <evanlucas@me.com> <evan.lucas@help.com>
diff --git a/AUTHORS b/AUTHORS
index 9c2afc726e14a9..b5a8a647b2d47b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -995,6 +995,7 @@ Doug Wade <doug@dougwade.io>
 Mohsen <mohsenekhtiari@yahoo.com>
 Marian <sorca_marian@yahoo.com>
 Justin Sprigg <IPWNDYOU@gmail.com>
+Eugene Ostroukhov <eostroukhov@google.com>
 Bryan Hughes <brhugh@microsoft.com>
 Ehsan Akhgari <ehsan@mozilla.com>
 Ingvar Stepanyan <me@rreverser.com>
@@ -1620,7 +1621,6 @@ Mandeep Singh <mandeep25894@gmail.com>
 Prakash Palaniappan <prakaash.kpk@gmail.com>
 Keita Akutsu <kakts.git@gmail.com>
 Michael Albert <michaalbert.42@gmail.com>
-Eugene Ostroukhov <eostroukhov@google.com>
 Vishal Bisht <vishalbisht7201@gmail.com>
 Griffith Tchenpan <griffith.tchenpan@myworkpapers.com>
 Oky Antoro <kiantrue@gmail.com>
@@ -2731,7 +2731,6 @@ imhype <543717080@qq.com>
 ptaylor <paul.e.taylor@me.com>
 Boxuan Li <liboxuan@connect.hku.hk>
 Aditya Pratap Singh <adisinghrajput@gmail.com>
-Eugene Ostroukhov <eostroukhov@netflix.com>
 Preveen Padmanabhan <dxb1230@gmail.com>
 Benjamin Ki <me@benjaminki.com>
 Daniel Nalborczyk <dnalborczyk@gmail.com>
@@ -2790,7 +2789,6 @@ Juan Roa <jdroa92@gmail.com>
 Ivan Villa <trezeguet55@gmail.com>
 Caleb ツ Everett <calebev@amazon.com>
 Miken <omarlozano053@gmail.com>
-Eugene Ostroukhov <eostroukhov@gmail.com>
 Gabriela Niño <gabynr@gmail.com>
 Mike MacCana <mike.maccana@gmail.com>
 Tim Baverstock <tim.baverstock@corp.badoo.com>