diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 3a0465dbb..1c4ab4895 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -604,6 +604,12 @@ sub pagetemplate (@) {
 		}
 	}
 
+	# everything below this point is only relevant to the comments
+	# themselves
+	if (!exists $commentstate{$page}) {
+		return;
+	}
+
 	if ($template->query(name => 'commentuser')) {
 		$template->param(commentuser =>
 			$commentstate{$page}{commentuser});
@@ -628,6 +634,14 @@ sub pagetemplate (@) {
 		$template->param(commentauthorurl =>
 			$commentstate{$page}{commentauthorurl});
 	}
+
+	if ($template->query(name => 'removeurl') &&
+	    IkiWiki::Plugin::remove->can("check_canremove") &&
+	    length $config{cgiurl}) {
+		$template->param(removeurl => IkiWiki::cgiurl(do => 'remove',
+			page => $page));
+		$template->param(have_actions => 1);
+	}
 }
 
 package IkiWiki::PageSpec;
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index 6f2b1619e..582efccb8 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -39,4 +39,15 @@ Comment by
 
 &mdash; <TMPL_VAR CTIME>
 </div>
+
+<TMPL_IF NAME="HAVE_ACTIONS">
+<div class="actions">
+<ul>
+<TMPL_IF NAME="REMOVEURL">
+<li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
+</TMPL_IF>
+</ul>
+</div><!--.actions-->
+</TMPL_IF>
+
 </div><!--.comment-->