diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index ee2ba7ea0..a429be525 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -53,6 +53,8 @@ Known issues with the [[plugins/comments]] plugin:
   (BTW, the rss feed in this situation seems ok; there the link element
   points back to the parent page.
 
+  > done --[[Joey]] 
+
 * It would be useful to have a pagespec that always matches all comments on 
   pages matching a glob. Something like `comment(blog/*)`.
   Perhaps postcomment could also be folded into this? Then the pagespec
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index 9d223bd7f..19698cd33 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -27,7 +27,7 @@ unknown IP address
 (<TMPL_VAR CTIME>)
 </div>
 
-<div class="comment-subject"><TMPL_VAR TITLE></div>
+<div class="comment-subject"><a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a></div>
 
 <div class="inlinecontent">
 <TMPL_VAR CONTENT>