diff --git a/plugins/OpenID/xrds.php b/actions/xrds.php
similarity index 100%
rename from plugins/OpenID/xrds.php
rename to actions/xrds.php
diff --git a/lib/router.php b/lib/router.php
index 37a7e4a0f3..90ffaec16a 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -431,7 +431,7 @@ class Router
         // user stuff
 
         foreach (array('subscriptions', 'subscribers',
-                       'nudge', 'all', 'foaf',
+                       'nudge', 'all', 'foaf', 'xrds',
                        'replies', 'inbox', 'outbox', 'microsummary') as $a) {
             $m->connect(':nickname/'.$a,
                         array('action' => $a),
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index ccbad5ffbd..199b1b3514 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -66,9 +66,6 @@ class OpenIDPlugin extends Plugin
     {
         $m->connect('main/openid', array('action' => 'openidlogin'));
         $m->connect('settings/openid', array('action' => 'openidsettings'));
-        $m->connect(':nickname/xrds',
-                    array('action' => 'xrds'),
-                    array('nickname' => '[a-zA-Z0-9]{1,64}'));
         $m->connect('xrds', array('action' => 'publicxrds'));
         $m->connect('index.php?action=finishopenidlogin', array('action' => 'finishopenidlogin'));
         $m->connect('index.php?action=finishaddopenid', array('action' => 'finishaddopenid'));