diff --git a/.mailmap b/.mailmap
index c42691b0a3af33..f691ac78ae2284 100644
--- a/.mailmap
+++ b/.mailmap
@@ -291,7 +291,9 @@ Minqi Pan <pmq2001@gmail.com>
 Minuk Park <parkm86@gmail.com>
 Minwoo Jung <nodecorelab@gmail.com> <jmwsoft@gmail.com>
 Minwoo Jung <nodecorelab@gmail.com> <minwoo@nodesource.com>
-Miroslav Bajtoš <miroslav@strongloop.com> <miro.bajtos@gmail.com>
+Miroslav Bajtoš <oss@bajtos.net> <mbajtoss@gmail.com>
+Miroslav Bajtoš <oss@bajtos.net> <miro.bajtos@gmail.com>
+Miroslav Bajtoš <oss@bajtos.net> <miroslav@strongloop.com>
 Mitar Milutinovic <mitar.git@tnode.com>
 Mithun Sasidharan <mithunsasidharan89@gmail.com> <msasidharan@paypal.com>
 Myles Borins <myles.borins@gmail.com> <mborins@us.ibm.com>
diff --git a/AUTHORS b/AUTHORS
index 03a9889921cc45..a7474dd6671a3d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -444,7 +444,7 @@ Ryan Graham <r.m.graham@gmail.com>
 Kelly Gerber <kellygerber22@yahoo.com>
 Ryan Doenges <rhdoenges@gmail.com>
 Sean Silva <chisophugis@gmail.com>
-Miroslav Bajtoš <miroslav@strongloop.com>
+Miroslav Bajtoš <oss@bajtos.net>
 Olof Johansson <olof@ethup.se>
 Sam Roberts <vieuxtech@gmail.com>
 Kevin Locke <kevin@kevinlocke.name>
@@ -1626,7 +1626,6 @@ Pini Houri <pinhasph@gmail.com>
 Runite618 <matthew_mo@hotmail.co.uk>
 phisixersai <phisixersai@gmail.com>
 hsmtkk <hsmtkk@gmail.com>
-Miroslav Bajtoš <mbajtoss@gmail.com>
 Sebastian Murphy <sebastianmurphy@gmail.com>
 陈刚 <chengang07@meituan.com>
 Jon Moss <me@jonathanmoss.me>