diff --git a/Changelog.md b/Changelog.md
index bbbf429be..6ae10853a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -14,6 +14,7 @@
 
 ## Features
 * Port admin pages to bootstrap, polish user search results, allow accounts to be closed from the backend [#5046](https://github.com/diaspora/diaspora/pull/5046)
+* Reference Salmon endpoint in Webfinger XRD to aid discovery by alternative implementations [#5062](https://github.com/diaspora/diaspora/pull/5062)
 
 # 0.4.0.1
 
diff --git a/app/views/publics/webfinger.erb b/app/views/publics/webfinger.erb
index 59c5e015f..b29677424 100644
--- a/app/views/publics/webfinger.erb
+++ b/app/views/publics/webfinger.erb
@@ -8,6 +8,7 @@
 
   <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="salmon" href="<%= @person.receive_url %>"/>
 
   <Link rel="diaspora-public-key" type = 'RSA' href="<%=Base64.strict_encode64(@person.exported_key)%>"/>
 </XRD>