--- token_comment.inc	2008-02-05 16:05:42.000000000 -0600
+++ token_comment.inc.patched	2008-02-05 16:05:21.000000000 -0600
@@ -12,6 +12,7 @@ function comment_token_values($type, $ob
       // Cast to an object just in case fussy Drupal gave us an array
       $comment = (object)$object;
 
+			 $values['comment-cid']             = $comment->cid;
       $values['comment-nid']             = $comment->nid;
       $values['comment-title']           = check_plain($comment->subject);
       $values['comment-body']            = check_markup($comment->comment, $comment->format);
@@ -49,7 +50,8 @@ function comment_token_values($type, $ob
  */
 function comment_token_list($type = 'all') {
   if ($type == 'comment' || $type == 'all') {
-    $tokens['comment']['comment-nid']             = t('Comment ID');
+    $tokens['comment']['comment-cid']             = t('Comment ID');
+    $tokens['comment']['comment-nid']             = t('Comment\'s node ID');
     $tokens['comment']['comment-title']           = t('Comment title');
     $tokens['comment']['comment-title-raw']       = t('Comment title. WARNING - raw user input');
     $tokens['comment']['comment-body']            = t('Comment body');