diff -upr comment_cck/comment_cck.install comment_cck.new-1.x/comment_cck.install
--- comment_cck/comment_cck.install	2007-09-08 10:54:45.000000000 -0700
+++ comment_cck.new-1.x/comment_cck.install	2008-01-20 16:45:03.200574645 -0800
@@ -24,6 +24,19 @@ function comment_cck_install() {
   }
 }
 
+function comment_cck_update_1() {
+  $ret = array();
+
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("UPDATE {system} SET weight = -10 WHERE name = 'comment_cck'");
+      break;
+  }
+
+  return $ret;
+}
+
 /**
  * Implementation of hook_uninstall().
  */
diff -upr comment_cck/comment_cck.module comment_cck.new-1.x/comment_cck.module
--- comment_cck/comment_cck.module	2007-09-08 11:21:49.000000000 -0700
+++ comment_cck.new-1.x/comment_cck.module	2008-01-20 16:48:05.195691664 -0800
@@ -78,7 +78,7 @@ function _comment_cck_submit($form_id, $
 /**
  * Implementation of hook_comment
  */
-function comment_cck_comment($comment, $op) {
+function comment_cck_comment(&$comment, $op) {
   switch ($op) {
     case 'insert':
       // Merge the new array with the old node
@@ -92,6 +92,8 @@ function comment_cck_comment($comment, $
       node_save($node);
       // Record that this comment added a revision
       db_query('INSERT INTO {comment_cck_revisions} (cid, vid, nid, previous_vid) VALUES (%d, %d, %d, %d)', $comment['cid'], $node->vid, $node->nid, $previous_vid);
+      // Update comment revision id
+      $comment['revision_id'] = $node->vid;
       break;
     case 'view':
       $node = node_load($comment->nid);