diff --git a/include/functions_comments.inc.php b/include/functions_comments.inc.php
index 7fe77335..cce34f96 100644
--- a/include/functions_comments.inc.php
+++ b/include/functions_comments.inc.php
@@ -267,6 +267,7 @@ function serendipity_fetchComments($id, $limit = null, $order = '', $showAll = f
                     e.timestamp AS entrytimestamp,
                     e.id AS entryid,
                     e.authorid,
+                    e.author as entryauthor,
                     co.id AS commentid,
                     co.parent_id AS parent_id,
                     co.status
diff --git a/templates/2k11/comments_by_author.tpl b/templates/2k11/comments_by_author.tpl
index 83323bca..6c51b9d0 100644
--- a/templates/2k11/comments_by_author.tpl
+++ b/templates/2k11/comments_by_author.tpl
@@ -1,6 +1,7 @@
 <h2 class="visuallyhidden">{$CONST.COMMENTS}</h2>
 {foreach from=$comments_by_authors item="entry_comments"}
-<article class="clearfix serendipity_entry">
+<article class="clearfix serendipity_entry{if $entry_comments.entryauthor == $entry_comments.author} serendipity_comment_author_self{/if}">
+    {$entry_comments.authorid}
 	<h3><a href="{$entry_comments.link}">{$entry_comments.title|@default:$entry_comments.link}</a></h3>
 	<div class="comments_for_entry">{$entry_comments.tpl_comments}</div>
 </article>