diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb
index f215f4575..28785f28a 100644
--- a/app/helpers/people_helper.rb
+++ b/app/helpers/people_helper.rb
@@ -51,14 +51,16 @@ module PeopleHelper
     end
   end
 
-  def person_href(person)
+  def person_href(person, opts={})
+    link = "href='"
+    link += AppConfig.pod_url if opts[:absolute]
     if person.local?
       username = person.diaspora_handle.split('@')[0]
       unless username.include?('.')
-        return "href='/u/#{person.diaspora_handle.split('@')[0]}'"
+        return link+"u/#{person.diaspora_handle.split('@')[0]}'"
       end
     end
-    return "href='/people/#{person.id}'"
+    return link+"people/#{person.id}'"
   end
 
 end
diff --git a/app/views/publics/webfinger.erb b/app/views/publics/webfinger.erb
index c99d6c134..cc6c64b36 100644
--- a/app/views/publics/webfinger.erb
+++ b/app/views/publics/webfinger.erb
@@ -6,6 +6,7 @@
   <Link rel="http://joindiaspora.com/seed_location" type = 'text/html' href="<%=@person.url%>"/>
   <Link rel="http://joindiaspora.com/guid" type = 'text/html' href="<%=@person.guid%>"/>
 
+  <Link rel='http://webfinger.net/rel/profile-page' type='text/html' <%="#{person_href(@person, :absolute => true)}"%>/>
   <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="<%=@person.public_url%>.atom"/>
 
   <Link rel="diaspora-public-key" type = 'RSA' href="<%=Base64.encode64(@person.exported_key)%>"/>
diff --git a/app/views/publics/webfinger.html.erb b/app/views/publics/webfinger.html.erb
deleted file mode 100644
index c99d6c134..000000000
--- a/app/views/publics/webfinger.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-  <Subject>acct:<%=@person.diaspora_handle%></Subject>
-  <Alias>"<%= @person.url %>"</Alias>
-  <Link rel="http://microformats.org/profile/hcard" type="text/html" href="<%=@person.url%>hcard/users/<%=@person.guid%>"/>
-  <Link rel="http://joindiaspora.com/seed_location" type = 'text/html' href="<%=@person.url%>"/>
-  <Link rel="http://joindiaspora.com/guid" type = 'text/html' href="<%=@person.guid%>"/>
-
-  <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="<%=@person.public_url%>.atom"/>
-
-  <Link rel="diaspora-public-key" type = 'RSA' href="<%=Base64.encode64(@person.exported_key)%>"/>
-</XRD>
diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb
index 8783c0fad..d50b42ac6 100644
--- a/spec/controllers/publics_controller_spec.rb
+++ b/spec/controllers/publics_controller_spec.rb
@@ -103,6 +103,11 @@ describe PublicsController do
       post :webfinger, 'q' => 'me@mydiaspora.pod.com'
       response.should be_not_found
     end
+
+    it 'has the users profile href' do
+      get :webfinger, :q => @user.diaspora_handle
+      response.body.should include "http://webfinger.net/rel/profile-page"
+    end
   end
 
   describe '#hub' do