diff --git a/mod/display.php b/mod/display.php
index ca6809eba..bc0ba388b 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -209,9 +209,6 @@ function display_content(App $a, $update = 0) {
 
 	$o = '';
 
-	$a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array());
-
-
 	if ($update) {
 		$nick = $_REQUEST['nick'];
 	} else {
@@ -281,6 +278,10 @@ function display_content(App $a, $update = 0) {
 		return;
 	}
 
+	$alternate = App::get_baseurl().'/display/'.$nick.'/'.$item_id.'.atom';
+	$a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'),
+				array('$alternate' => $alternate));
+
 
 	$groups = array();
 
diff --git a/view/templates/display-head.tpl b/view/templates/display-head.tpl
index 9a96a2398..f4d050eec 100644
--- a/view/templates/display-head.tpl
+++ b/view/templates/display-head.tpl
@@ -1,4 +1,4 @@
-
+<link href='{{$alternate}}' rel='alternate' type='application/atom+xml'>
 <script>
 $(document).ready(function() {
 	$(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl");
@@ -6,4 +6,3 @@ $(document).ready(function() {
 	$(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl");
 });
 </script>
-