diff --git a/pagure/static/request_ev.js b/pagure/static/request_ev.js
new file mode 100644
index 0000000..a293315
--- /dev/null
+++ b/pagure/static/request_ev.js
@@ -0,0 +1,50 @@
+add_comment = function(data) {
+  console.log('Adding comment ' + data.comment_added);
+  if (data.commit_id){
+    // Inline comment
+    console.log('Inline');
+    var _data = '<tr><td></td><td colspan="2"><table style="width:100%"> \
+      <tr><td> \
+      <a href="/user/' + data.comment_user + '">'
+      + data.comment_user + '</a></td> \
+      <td class="right">' + data.comment_date + '</td></tr> \
+      <tr><td colspan="2" class="pr_comment">'
+      + data.comment_added +
+      '</td></tr></table></td></tr>';
+    var field = $('[data-commit="' + data.commit_id + '"]').parent();
+    var id = field.children().children().attr('id').split('_')[0];
+    var row = $('#' + id + '_' + (parseInt(data.line) + 1)).parent().parent();
+    row.before(_data);
+  } else {
+    // Generic comment
+    console.log('generic');
+    var field = $('#request_comment');
+    var _data = '<section class="issue_comment"> \
+      <header id="comment-' + data.comment_id + '"> \
+        <img class="avatar circle" src="' + data.avatar_url + '"/> \
+        <a href="/user/' + data.comment_user + '"> \
+          ' + data.comment_user + '\
+        </a> - <span title="' + data.comment_date + '">seconds ago</span> \
+        <a class="headerlink" title="Permalink to this headline" \
+          href="#comment-' + data.comment_id + '">¶</a> \
+        <aside class="issue_action icon"> \
+          <a class="reply" title="Reply to this comment - loose formating"> \
+            reply \
+          </a> \
+        </aside> \
+      </header> \
+      <div class="comment_body"> \
+        <p>' + data.comment_added + '</p> \
+      </div> \
+    </section>';
+
+    field.html(field.html() + _data);
+  }
+}
+
+process_event = function(data, requestid){
+  console.log(data);
+  if (data.comment_added){
+    add_comment(data);
+  }
+}
diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 581883e..910a139 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -273,13 +273,14 @@
 
 
 {% if pull_request and pull_request.comments%}
-<section class="request_comment">
+<section class="request_comment" id="request_comment">
 <form action="{{ url_for('.pull_request_drop_comment', username=username,
     repo=repo.name, requestid=requestid) }}" method="post">
 
 {% for comment in pull_request.discussion %}
   {% if not comment.commit_id %}
-    {{ show_comment(comment, loop.index, repo, username, requestid, form, repo_admin) }}
+    {{ show_comment(comment, loop.index, repo, username,
+                    requestid, form, repo_admin) }}
   {% endif %}
 {% endfor %}
 {{ mergeform.csrf_token }}
@@ -516,14 +517,7 @@ function try_async_comment(form) {
     .done(function(data) {
       if(data == 'ok') {
         // We have submitted the comment correctly
-        var comment_fld = $(form).find("#comment")[0];
-        var comment = comment_fld.value;
-        var comment_view = "<tr><td></td><td colspan='2'><table style='width:100%'><tbody><tr><td>" +
-                           "<a href='/user/{{ g.fas_user.username }}'>{{ g.fas_user.username }}</a>" +
-                           "</td><td class='right'>Now</td></tr><tr>" +
-                           "<tr><td class='pr_comment' colspan='2'><p>" +
-                           comment + "</p></td></tr></tbody></td></tr>";
-        $(form).closest('tr').before($(comment_view)).remove();
+        $(form).remove();
       } else {
         // Make the browser submit the form sync
         $(form).off('submit');
@@ -540,5 +534,31 @@ function try_async_comment(form) {
 {% endif %}
 
 </script>
+
+
+{% if config['EVENTSOURCE_SOURCE'] %}
+<script type="text/javascript"
+  src="{{ url_for('static', filename='request_ev.js') }}"></script>
+
+<script type="text/javascript">
+var source = null;
+if (!!window.EventSource) {
+  source = new EventSource('{{ config["EVENTSOURCE_SOURCE"]
+    + request.script_root + request.path }}');
+}
+
+window.onbeforeunload = function() {
+    source.close()
+};
+
+source.addEventListener('message', function(e) {
+  console.log(e.data);
+  var data = $.parseJSON(e.data);
+  process_event(data, "{{ request.uid }}");
+
+  }, false);
+</script>
+{% endif %}
+
 {% endblock %}