diff --git a/app/views/publics/hcard.erb b/app/views/publics/hcard.erb
index e544a8592..6df2462bb 100644
--- a/app/views/publics/hcard.erb
+++ b/app/views/publics/hcard.erb
@@ -13,7 +13,7 @@
        <dl class="entity_nickname"> 
         <dt>Nickname</dt> 
         <dd> 
-        <a href="<%=@user.url%>" rel="me" class="nickname url uid"><%= @user.real_name%></a> 
+        <a href="<%=@user.url%>hcard" rel="me" class="nickname url uid"><%= @user.real_name%></a> 
 </dd> 
 </dl> 
        <dl class="entity_fn"> 
@@ -25,7 +25,7 @@
        <dl class="entity_url"> 
         <dt>URL</dt> 
         <dd> 
-        <a href="<%= @user.url%>" rel="me" class="url"><%= @user.url%></a> 
+        <a href="<%= @user.url%>hcard" rel="me" class="url"><%= @user.url%></a> 
 </dd> 
 </dl> 
        <dl class="entity_note"> 
diff --git a/lib/common.rb b/lib/common.rb
index 862cb1004..27db0866b 100644
--- a/lib/common.rb
+++ b/lib/common.rb
@@ -142,7 +142,7 @@ module Diaspora
 <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
 <id>#{OWNER.url}</id>
 <title>#{OWNER.real_name}</title>
-<link rel="alternative" type="text/html" href="#{OWNER.url}hcard"/>
+<link rel="alternative" type="text/html" href="#{OWNER.url}"/>
 </activity:subject>
         XML
       end