diff --git a/.mailmap b/.mailmap
index 4773c4a24..da46dc159 100644
--- a/.mailmap
+++ b/.mailmap
@@ -79,8 +79,9 @@ Sabyasachi Sengupta <Sabyasachi.Sengupta@alcatel-lucent.com> <sabyasachi.sengupt
 Saurabh Shah <ssaurabh@vmware.com> <ssaurabh@nicira.com>
 Shad Ansari <shad.ansar@hpe.com> <shad.ansari@hp.com>
 Shih-Hao Li <shihli@vmware.com> <shli@nicira.com>
-Simon Horman <simon.horman@corigine.com> <horms@verge.net.au>
-Simon Horman <simon.horman@corigine.com> <simon.horman@netronome.com>
+Simon Horman <horms@ovn.org> <horms@verge.net.au>
+Simon Horman <horms@ovn.org> <simon.horman@corigine.com>
+Simon Horman <horms@ovn.org> <simon.horman@netronome.com>
 Stephen Finucane <stephen@that.guru> <stephen.finucane@intel.com>
 Thomas F. Herbert <thomasfherbert@gmail.com> <thomasfherbert@entpnt.com>
 Thomas Graf <tgraf@noironetworks.com> <tgraf@redhat.com>
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 01c9b72a0..af3df81e6 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -416,7 +416,7 @@ Shashank Ram                       rams@vmware.com
 Shashwat Srivastava                shashwat.srivastava@tcs.com
 Shih-Hao Li                        shihli@vmware.com
 Shu Shen                           shu.shen@radisys.com
-Simon Horman                       simon.horman@corigine.com
+Simon Horman                       horms@ovn.org
 Simon Jones                        batmanustc@gmail.com
 Sivaprasad Tummala                 sivaprasad.tummala@intel.com
 Somnath Chatterjee                 somnath.b.chatterjee@ericsson.com