diff --git a/wp-comments.php b/wp-comments.php
index 399f8588a..cb8770d8c 100644
--- a/wp-comments.php
+++ b/wp-comments.php
@@ -33,7 +33,7 @@
 <?php foreach ($comments as $comment) { ?>
 	<li id="comment-<?php comment_ID() ?>">
 	<?php comment_text() ?>
-	<p><cite><?php comment_type(); ?> by <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
+	<p><cite><?php comment_type(); ?> by <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link('Edit This', ' |'); ?></p>
 	</li>
 
 <?php } // end for each comment ?>
diff --git a/wp-includes/template-functions.php b/wp-includes/template-functions.php
index 5dfe42b31..bef472550 100644
--- a/wp-includes/template-functions.php
+++ b/wp-includes/template-functions.php
@@ -562,6 +562,24 @@ function edit_post_link($link = 'Edit This', $before = '', $after = '') {
 	echo "$before <a href='$location'>$link</a> $after";
 }
 
+function edit_comment_link($link = 'Edit This', $before = '', $after = '') {
+	global $user_level, $post, $comment, $siteurl;
+
+	get_currentuserinfo();
+
+	if ($user_level > 0) {
+		$authordata = get_userdata($post->post_author);
+		if ($user_level < $authordata->user_level) {
+			return;
+		}
+	} else {
+		return;
+	}
+
+	$location = "$siteurl/wp-admin/post.php?action=editcomment&amp;comment=$comment->comment_ID";
+	echo "$before <a href='$location'>$link</a> $after";
+}
+
 /***** Date/Time tags *****/
 
 function the_date_xml() {