diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 2df5a727c..b98864722 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -145,6 +145,10 @@ sub preprocess (@) { #{{{
 			push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
 				'" rel="openid.delegate" />';
 		}
+		if (exists $params{xrds-location} && safeurl($params{xrds-location})) {
+			push @{$metaheaders{$page}}, '<meta http-equiv="X-XRDS-Location"'.
+				'content="'.encode_entities($params{xrds-location}).'" />';
+		}
 	}
 	elsif ($key eq 'redir') {
 		return "" if $page ne $destpage;
diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index b503e4511..336c79806 100644
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -64,10 +64,15 @@ Supported fields:
 * openid
 
   Adds html &lt;link&gt; tags to perform OpenID delegation to an external
-  OpenID server. This lets you use an ikiwiki page as your OpenID. Example:
+  OpenID server. An optional `xrds-location` parameter lets you specify the
+  location of any [eXtensible Resource
+  DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml).
 
-  	\\[[meta openid="http://joeyh.myopenid.com/"
-	server="http://www.myopenid.com/server"]]
+  This lets you use an ikiwiki page as your OpenID. Example:
+
+	\\[[meta openid="http://joeyh.myopenid.com/"
+	server="http://www.myopenid.com/server"
+	xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com""]]
 
 * link