diff -u comment_cck/comment_cck.module ./shared_modules/comment_cck/comment_cck.module
--- comment_cck/comment_cck.module	2007-09-08 18:54:45.000000000 +0100
+++ ./shared_modules/comment_cck/comment_cck.module	2008-05-31 19:01:26.000000000 +0100
@@ -15,17 +15,21 @@
       $content_form = content_form($node);
       // This will hold the form with only the fields we need
       $final_form = array();
-
+      $final_form['type']['#value'] = $node->type;
       foreach ($fields as $field) {
         if (isset($content_form[$field])) {
           // Only add fields that are comment_cck enabled
           $final_form[$field] = $content_form[$field];
         }
       }
+      // call fieldgroup_form_alter to add all the groupings.
+      if (function_exists(fieldgroup_form_alter)) {
+        fieldgroup_form_alter($node->type . "_node_form", $final_form);
+      }
       // Add it to comment_filter so it maintains the correct postion in the form
       $form['comment_filter']['comment_cck'] = $final_form;
       // It's tons easier like this
       $form['comment_filter']['comment_cck']['#tree'] = TRUE;
     }
@@ -55,16 +59,32 @@
   }
 }