Index: features.module
===================================================================
--- features.module	(revision 2653)
+++ features.module	(working copy)
@@ -299,7 +299,7 @@
 
   // Features provides integration on behalf of these modules.
   // Note that ctools is placed last because it implements hooks "dynamically" for other modules.
-  $modules = array('block', 'content', 'context', 'filter', 'imagecache', 'node', 'user', 'views', 'ctools');
+  $modules = array('block', 'content', 'context', 'fieldgroup', 'filter', 'imagecache', 'node', 'user', 'views', 'ctools');
 
   foreach (array_filter($modules, 'module_exists') as $module) {
     if (!module_hook($module, 'features_api')) {
Index: includes/features.fieldgroup.inc
===================================================================
--- includes/features.fieldgroup.inc	(revision 0)
+++ includes/features.fieldgroup.inc	(revision 0)
@@ -0,0 +1,156 @@
+<?php
+// $Id$
+
+/**
+ * Implementation of hook_features_api().
+ */
+function fieldgroup_features_api() {
+  return array(
+    'fieldgroup' => array(
+      'name' => t('Fieldgroup'),
+      'default_hook' => 'fieldgroup_default_groups',
+    ),
+  );
+}
+
+/**
+ * Implementation of hook_features_export().
+ */
+function fieldgroup_features_export($data, &$export, $module_name = '') {
+  $pipe = array();
+
+  // The hook_fieldgroup_default_groups() hook integration is provided by the
+  // features module so we need to add it as a dependency.
+  $export['dependencies']['features'] = 'features';
+
+  // Collect a group to module map
+  $map = array();
+  $modules = module_implements('fieldgroup_default_groups');
+  foreach ($modules as $module) {
+    $groups = module_invoke($module, 'fieldgroup_default_groups');
+    foreach ($groups as $group) {
+      $map["{$group['type_name']}-{$group['group_name']}"] = $module;
+    }
+  }
+
+  foreach ($data as $instance) {
+    // If this group is already provided by another module, remove the group
+    // and add the other module as a dependency.
+    if (isset($map[$instance]) && $map[$instance] != $module_name) {
+      if (isset($export['features']['fieldgroup'][$instance])) {
+        unset($export['features']['fieldgroup'][$instance]);
+      }
+      $module = $map[$instance];
+      $export['dependencies'][$module] = $module;
+    }
+    // If the group has not yet been exported, add it.
+    else {
+      $split = explode('-', $instance);
+      $type_name = $split[0];
+      $group_name = $split[1];
+      $groups = fieldgroup_groups($type_name);
+
+      if (isset($groups[$group_name]) && $group = $groups[$group_name]) {
+        $export['features']['fieldgroup'][$instance] = $instance;
+        $export['dependencies']['fieldgroup'] = 'fieldgroup';
+      }
+    }
+  }
+
+  return $pipe;
+}
+
+/**
+ * Implementation of hook_features_export_render().
+ */
+function fieldgroup_features_export_render($module = 'foo', $data) {
+  $translatables = $code = array();
+
+  $code[] = '  $groups = array();';
+  $code[] = '';
+  foreach ($data as $instance) {
+    $instance = explode('-', $instance);
+    $type_name = $instance[0];
+    $group_name = $instance[1];
+    $groups = fieldgroup_groups($type_name);
+    $group = $groups[$group_name];
+    // Clean up the fields to only list the names.
+    $group['fields'] = array_keys((array) $group['fields']);
+
+    $code[] = '  // Exported group: '. $group_name;
+    $code[] = '  $groups[] = '. features_var_export($group, '  ') .';';
+    $code[] = '';
+
+    // Add any labels to translatables array.
+    if (!empty($group['label'])) {
+      $translatables[] = $group['label'];
+    }
+  }
+  if (!empty($translatables)) {
+    $code[] = features_translatables_export($translatables, '  ');
+  }
+  $code[] = '  return $groups;';
+  $code = implode("\n", $code);
+  return array('fieldgroup_default_groups' => $code);
+}
+
+/**
+ * Implementation of hook_features_revert().
+ */
+function fieldgroup_features_revert($module) {
+  fieldgroup_features_rebuild($module);
+}
+
+/**
+ * Implementation of hook_features_rebuild().
+ * Rebuilds CCK fieldgroup definitions from code defaults.
+ */
+function fieldgroup_features_rebuild($module) {
+  $groups = module_invoke($module, 'fieldgroup_default_groups');
+  if (!empty($groups)) {
+    content_clear_type_cache(TRUE);
+
+    foreach ($groups as $group) {
+      $type_name = $group['type_name'];
+      $group_name = $group['group_name'];
+      $groups = fieldgroup_groups($type_name);
+
+      if (isset($groups[$group_name])) {
+        $existing_group = $groups[$group_name];
+        // Only field names are exported in fieldgroup_features_export_render(), so we 
+        // update the existing group to match.
+        $existing_group['fields'] = array_keys($existing_group['fields']);
+      }
+
+      // No need to rebuild if the group already exists and is identical.
+      if ($existing_group != $group) {
+        // Update each field from this group.
+        foreach ($group['fields'] as $field_name) {
+          if ($field = content_fields($field_name, $type_name)) {
+            $field['group'] = $group_name;
+            fieldgroup_update_fields($field);
+          }
+        }
+
+        // Look in the old group for any fields that have been removed.
+        if ($existing_group && !empty($existing_group['fields'])) {
+          foreach($existing_group['fields'] as $field_name) {
+            // We only want to update the field if the field no longer exists in the group 
+            // and the field's existing group name matches the group currently being rebuilt.
+            if (
+              !in_array($field_name, $group['fields']) &&
+              _fieldgroup_field_get_group($type_name, $field_name) == $group_name &&
+              $field = content_fields($field_name, $type_name)
+            ) {
+              $field['group'] = '';
+              fieldgroup_update_fields($field);
+            }
+          }
+        }
+
+        fieldgroup_save_group($type_name, $group);
+        variable_set('menu_rebuild_needed', TRUE);
+      }
+    }
+  }
+}
\ No newline at end of file
Index: includes/features.node.inc
===================================================================
--- includes/features.node.inc	(revision 2653)
+++ includes/features.node.inc	(working copy)
@@ -66,6 +66,12 @@
         }
       }
 
+      // Create a pipe for Fieldgroups
+      if (function_exists('fieldgroup_groups') && $groups = fieldgroup_groups($type)) {
+        foreach ($groups as $group) {
+          $pipe['fieldgroup'][] = "{$type}-{$group['group_name']}";
+        }
+      }
     }
   }