diff --git a/mod/follow.php b/mod/follow.php
index 925572640..80226f3b9 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -58,7 +58,7 @@ function follow_post(&$a) {
 	}
 
 	if($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) {
-		notice( t('Communication options with this network have been restricted.') . EOL);
+		notice( t('The profile address specified belongs to a network which has been disabled on this site.') . EOL);
 		$ret['notify'] = '';
 	}
 
diff --git a/mod/hcard.php b/mod/hcard.php
new file mode 100644
index 000000000..5505ca08e
--- /dev/null
+++ b/mod/hcard.php
@@ -0,0 +1,50 @@
+<?php
+
+function hcard_init(&$a) {
+
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user()))
+		return;
+
+	if($a->argc > 1)
+		$which = $a->argv[1];
+	else {
+		notice( t('No profile') . EOL );
+		$a->error = 404;
+		return;
+	}
+
+	$profile = 0;
+	if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
+		$which = $a->user['nickname'];
+		$profile = $a->argv[1];		
+	}
+
+	profile_load($a,$which,$profile);
+
+	if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
+		$a->page['htmlhead'] .= '<meta name="friendika.community" content="true" />';
+	}
+	if(x($a->profile,'openidserver'))				
+		$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
+	if(x($a->profile,'openid')) {
+		$delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
+		$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
+	}
+
+	$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+	$keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
+	if(strlen($keywords))
+		$a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
+
+	$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
+	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
+	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
+	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
+	header('Link: <' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
+  	
+	$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
+	foreach($dfrn_pages as $dfrn)
+		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".$a->get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
+
+}
+
diff --git a/mod/xrd.php b/mod/xrd.php
index c96c18f3c..9021222b7 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -47,6 +47,7 @@ function xrd_content(&$a) {
 	$o = replace_macros($tpl, array(
 		'$accturi'     => $uri,
 		'$profile_url' => $a->get_baseurl() . '/profile/'       . $r[0]['nickname'],
+		'$hcard_url'   => $a->get_baseurl() . '/hcard/'         . $r[0]['nickname'],
 		'$atom'        => $a->get_baseurl() . '/dfrn_poll/'     . $r[0]['nickname'],
 		'$photo'       => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid']      . '.jpg',
 		'$dspr'        => $dspr,
diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl
index 0dabaa5a3..fd11ad600 100644
--- a/view/xrd_person.tpl
+++ b/view/xrd_person.tpl
@@ -15,7 +15,7 @@
           href="$profile_url" />
     <Link rel="http://microformats.org/profile/hcard"
           type="text/html"
-          href="$profile_url" />
+          href="$hcard_url" />
     <Link rel="http://webfinger.net/rel/avatar"
           type="image/jpeg"
           href="$photo" />