diff --git a/isso/css/isso.css b/isso/css/isso.css
index 47cf675..2a55658 100644
--- a/isso/css/isso.css
+++ b/isso/css/isso.css
@@ -15,6 +15,14 @@
     color: #555;
     font-weight: bold;
 }
+#isso-thread > .isso-feedlink {
+    float: right;
+    padding-left: 1em;
+}
+#isso-thread > .isso-feedlink > a {
+    font-size: 0.8em;
+    vertical-align: bottom;
+}
 #isso-thread .textarea {
     min-height: 58px;
     outline: 0;
@@ -119,10 +127,12 @@
     color: gray !important;
     clear: left;
 }
+.isso-feedlink,
 .isso-comment > div.text-wrapper > .isso-comment-footer a {
     font-weight: bold;
     text-decoration: none;
 }
+.isso-feedlink:hover,
 .isso-comment > div.text-wrapper > .isso-comment-footer a:hover {
     color: #111111 !important;
     text-shadow: #aaaaaa 0 0 1px !important;
@@ -152,6 +162,7 @@
 .isso-postbox {
     max-width: 68em;
     margin: 0 auto 2em;
+    clear: right;
 }
 .isso-postbox > .form-wrapper {
     display: block;
diff --git a/isso/js/app/api.js b/isso/js/app/api.js
index d0fbf2f..30cca9c 100644
--- a/isso/js/app/api.js
+++ b/isso/js/app/api.js
@@ -191,6 +191,10 @@ define(["app/lib/promise", "app/globals"], function(Q, globals) {
         return deferred.promise;
     };
 
+    var feed = function(tid) {
+        return endpoint + "/feed?" + qs({uri: tid || location});
+    }
+
     return {
         endpoint: endpoint,
         salt: salt,
@@ -202,6 +206,7 @@ define(["app/lib/promise", "app/globals"], function(Q, globals) {
         fetch: fetch,
         count: count,
         like: like,
-        dislike: dislike
+        dislike: dislike,
+        feed: feed
     };
 });
diff --git a/isso/js/app/i18n/en.js b/isso/js/app/i18n/en.js
index ec4b4d0..d3968b8 100644
--- a/isso/js/app/i18n/en.js
+++ b/isso/js/app/i18n/en.js
@@ -7,6 +7,7 @@ define({
 
     "num-comments": "One Comment\n{{ n }} Comments",
     "no-comments": "No Comments Yet",
+    "atom-feed": "Atom feed",
 
     "comment-reply": "Reply",
     "comment-edit": "Edit",
diff --git a/isso/js/app/i18n/fr.js b/isso/js/app/i18n/fr.js
index e29d024..f65cc6a 100644
--- a/isso/js/app/i18n/fr.js
+++ b/isso/js/app/i18n/fr.js
@@ -6,6 +6,7 @@ define({
     "postbox-submit": "Soumettre",
     "num-comments": "{{ n }} commentaire\n{{ n }} commentaires",
     "no-comments": "Aucun commentaire pour l'instant",
+    "atom-feed": "Flux Atom",
     "comment-reply": "Répondre",
     "comment-edit": "Éditer",
     "comment-save": "Enregistrer",
diff --git a/isso/js/embed.js b/isso/js/embed.js
index 680880b..715413c 100644
--- a/isso/js/embed.js
+++ b/isso/js/embed.js
@@ -27,6 +27,11 @@ require(["app/lib/ready", "app/config", "app/i18n", "app/api", "app/isso", "app/
             return console.log("abort, #isso-thread is missing");
         }
 
+        var feedLink = $.new('a', i18n.translate('atom-feed'));
+        var feedLinkWrapper = $.new('span.isso-feedlink');
+        feedLink.href = api.feed($("#isso-thread").getAttribute("data-isso-id"));
+        feedLinkWrapper.append(feedLink);
+        $("#isso-thread").append(feedLinkWrapper);
         $("#isso-thread").append($.new('h4'));
         $("#isso-thread").append(new isso.Postbox(null));
         $("#isso-thread").append('<div id="isso-root"></div>');