diff --git a/.mailmap b/.mailmap
index 824df36e33..88dd435b16 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,8 +9,8 @@
 <laine@redhat.com> <laine@laine.org>
 <meyering@redhat.com> <jim@meyering.net>
 <socketpair@gmail.com> <socketpair gmail com>
-<soren@canonical.com> <soren@ubuntu.com>
+<soren@linux2go.dk> <soren@ubuntu.com>
 <jfehlig@novell.com> <jfehlig@linux-ypgk.site>
 <jclift@redhat.com> <justin@salasaga.org>
 <berrange@redhat.com> <dan@berrange.com>
-<soren@canonical.com> <soren@linux2go.dk>
+<soren@linux2go.dk> <soren@canonical.com>
diff --git a/AUTHORS b/AUTHORS
index 9e76ebce49..3c7319b2b3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -73,7 +73,7 @@ Patches have also been contributed by:
   Florian Vichot       <florian.vichot@diateam.net>
   Takahashi Tomohiro   <takatom@jp.fujitsu.com>
   Serge E. Hallyn      <serue@us.ibm.com>
-  Soren Hansen         <soren@canonical.com>
+  Soren Hansen         <soren@linux2go.dk>
   Abel Míguez Rodríguez<amiguezr@pdi.ucm.es>
   Doug Goldstein       <cardoe@gentoo.org>
   Javier Fontan        <jfontan@gmail.com>