diff --git a/field_group.features.inc b/field_group.features.inc
new file mode 100644
index 0000000..407bb78
--- /dev/null
+++ b/field_group.features.inc
@@ -0,0 +1,51 @@
+<?php
+
+
+/**
+ * Implements hook_features_export_alter().
+ *
+ * For a given feature, add field groups that contain any fields that
+ * are a part of this feature.  Also, add parent groups of any groups
+ * that are a part of this feature.
+ */
+function field_group_features_export_alter(&$export, $module_name) {
+  //Make sure we have fresh data by loading directly.
+  ctools_include('export');
+  $field_groups = ctools_export_load_object('field_group');
+  foreach ($field_groups as &$field_group) {
+    field_group_unpack($field_group);
+  }
+
+  //Add fieldgroups based on the fields that are present.
+  if (!empty($export['features']['field'])) {
+    foreach ($export['features']['field'] as $field) {
+      list($entity_type, $bundle, $field_name) = explode('-', $field);
+
+      foreach ($field_groups as $group_id => $group) {
+        if ($group->entity_type == $entity_type && $group->bundle == $bundle
+          && in_array($field_name, $group->children)) {
+          $export['features']['field_group'][$group_id] = $group_id;
+        }
+      }
+    }
+  }
+
+  //Add any parent field groups that haven't been selected.
+  if (!empty($export['features']['field_group'])) {
+    foreach ($export['features']['field_group'] as $id) {
+      $group = isset($field_groups[$id]) ? $field_groups[$id] : FALSE;
+
+      if ($group && !empty($group->parent_name)) {
+        $parent_id = $group->parent_name . '|' . $group->entity_type . '|' . $group->bundle . '|' . $group->mode;
+        $parent_group = isset($field_groups[$parent_id]) ? $field_groups[$parent_id] : FALSE;
+
+        if ($parent_group && !isset($export['features']['field_group'][$parent_id])) {
+          $export['features']['field_group'][$parent_id] = $parent_id;
+        }
+      }
+    }
+    if(empty($export['dependencies']['field_group'])) {
+      $export['dependencies']['field_group'] = 'field_group';
+    }
+  }
+}