--- token_comment-1.3.4.10.inc	Wed Jul 07 19:41:48 2010
+++ token_comment.inc	Wed Jul 07 19:46:51 2010
@@ -32,6 +32,8 @@ function comment_token_values($type, $ob
       $values['comment-author-uid']      = $comment->uid;
       $values['comment-author-homepage'] = check_url($comment->homepage);
 
+      $values['comment-hostname']        = db_result(db_query("SELECT hostname FROM {comments} WHERE cid = %d", $comment->cid));
+
       // Raw counterparts of user supplied data.
       $values['comment-title-raw']       = $comment->subject;
       $values['comment-body-raw']        = $comment->comment;
@@ -78,6 +80,8 @@ function comment_token_list($type = 'all
     $tokens['comment']['comment-author-name']     = t('The name left by the comment author.');
     $tokens['comment']['comment-author-name-raw'] = t('The name left by the comment author.');
     $tokens['comment']['comment-author-homepage'] = t('The home page URL left by the comment author.');
+
+    $tokens['comment']['comment-hostname']        = t("Comment author's IP address.");
 
     $tokens['comment']['comment-author-mail']     = t('The email address left by the comment author.');
     $tokens['comment']['comment-author-mail-raw'] = t('The email address left by the comment author."');