diff --git a/drupalorg/drupalorg.module b/drupalorg/drupalorg.module
index b429aea..4f049e9 100755
--- a/drupalorg/drupalorg.module
+++ b/drupalorg/drupalorg.module
@@ -2289,3 +2289,23 @@ function drupalorg_cron_queue_info_alter(&$queues) {
   }
   unset($queues['aggregator_feeds']);
 }
+
+/**
+ * Implementation of hook_comment_view_alter()
+ *
+ * Adds a 'report spam' link to the action links
+ * in comments. This link directs to the webmaster
+ * queue, passing some values in the URL in order
+ * to pre-populate the issue form in the queue, allowing
+ * users to report spam.
+ */
+function drupalorg_comment_view_alter(&$build) {
+  if (node_access('create', 'project_issue')) {
+    $comment = $build['#comment'];
+    $build['links']['comment']['#links']['comment-report'] = array(
+      'title' => t('report spam'),
+      'href' => 'node/add/project-issue/webmasters?component=Spam&categories=task&title=' . urlencode("Spam Report") . '&body=' . urlencode('Reporting the following comment as spam: ' . url('node/' . $comment->nid, array('absolute' => TRUE, 'fragment' => 'comment-' . $comment->cid))),
+      'html' => TRUE,
+    );
+  }
+}