diff --git a/.mailmap b/.mailmap
index ec69fc5318e..7d6e6c7ee5d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -305,7 +305,8 @@ Robin Appelman <icewind@owncloud.com> Robin <robin@Amaya.(none)>
 Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail.com>
 Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail>
 Robin Appelman <icewind@owncloud.com> Robin Appelman <robin@icewind.nl>
-Robin McCorkell <rmccorkell@karoshi.org.uk> Robin McCorkell <rmccorkell@owncloud.com>
+Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@karoshi.org.uk>
+Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@owncloud.com>
 Rodrigo Hjort <rodrigo.hjort@gmail.com>
 Roeland Jago Douma <rullzer@owncloud.com> Roeland Jago Douma <roeland@famdouma.nl>
 rok <brejktru@gmail.com>
diff --git a/.mention-bot b/.mention-bot
index 449cf7d1c68..c805917bee0 100644
--- a/.mention-bot
+++ b/.mention-bot
@@ -5,6 +5,10 @@
     {
       "name": "DeepDiver1975", 
       "files": ["apps/dav/**"] 
+    },
+    {
+      "name": "Xenopathic",
+      "files": ["apps/files_external/**"]
     }
   ],
   "userBlacklist": ["owncloud-bot", "scrutinizer-auto-fixer"]