diff --git a/uc_extra_fields_pane.features.inc b/uc_extra_fields_pane.features.inc
new file mode 100644
index 0000000..3334e08
--- /dev/null
+++ b/uc_extra_fields_pane.features.inc
@@ -0,0 +1,83 @@
+<?php
+/**
+ * @file
+ * Features integration.
+ */
+
+/**
+ * Implementation of hook_features_export().
+ */
+function uc_extra_fields_pane_field_features_export($data, &$export, $module_name = '') {
+  $export['dependencies']['features'] = 'features';
+  $export['dependencies']['uc_extra_fields_pane'] = 'uc_extra_fields_pane';
+  $export['package'] = 'Ubercart - extra';
+  foreach ($data as $field) {
+    $export['features']['uc_extra_fields_pane_field'][$field] = $field;
+  }
+  return array();
+}
+
+/**
+ * Implementation of hook_features_export_options().
+ */
+function uc_extra_fields_pane_field_features_export_options() {
+  $fields = array();
+  $db_result = db_query('SELECT db_name, label FROM {uc_extra_fields}');
+  while ($field = db_fetch_object($db_result)) {
+    $fields[$field->db_name] = $field->label;
+  }
+  return $fields;
+}
+
+/**
+ * Implementation of hook_features_export_render().
+ */
+function uc_extra_fields_pane_field_features_export_render($module, $data) {
+  $code = array();
+  $code[] = '  $uc_extra_fields_pane_fields = array();';
+  $code[] = '';
+
+  if (count($data) > 1) {
+    // If we export more than one field, than load all fields first.
+    UCXF_FieldList::getAllFields();
+  }
+
+  foreach ($data as $name) {
+    if ($field = UCXF_FieldList::getFieldByName($name)) {
+      $field_data = $field->to_array();
+      unset($field_data['field_id']);
+      $code[] = "  \$uc_extra_fields_pane_fields['{$name}'] = " . features_var_export($field_data) .";";
+    }
+  }
+  $code[] = "return \$uc_extra_fields_pane_fields;";
+  $code = implode("\n", $code);
+
+  return array('uc_extra_fields_pane_default_fields' => $code);
+}
+
+/**
+ * Implementation of hook_features_revert().
+ */
+function uc_extra_fields_pane_field_features_revert($module) {
+  uc_extra_fields_pane_field_features_rebuild($module);
+}
+
+/**
+ * Implementation of hook_features_rebuild().
+ */
+function uc_extra_fields_pane_field_features_rebuild($module) {
+  if ($defaults = features_get_default('uc_extra_fields_pane_field', $module)) {
+    // Load all fields first.
+    UCXF_FieldList::getAllFields();
+    foreach ($defaults as $field_data) {
+      $field = UCXF_FieldList::getFieldByName($field_data['db_name']);
+      // If the field doesn't exist, then create it.
+      if (!$field) {
+        $field = UCXF_FieldList::createField($field_data['pane_type']);
+      }
+      // Set the field's data and save the field.
+      $field->from_array($field_data);
+      $field->save();
+    }
+  }
+}
diff --git a/uc_extra_fields_pane.module b/uc_extra_fields_pane.module
index 878ce90..afa4f83 100644
--- a/uc_extra_fields_pane.module
+++ b/uc_extra_fields_pane.module
@@ -35,6 +35,10 @@
  * - VIEWS HOOKS
  *   uc_extra_fields_pane_views_api(), other views hooks are in views/uc_extra_fields_pane.views.inc
  *
+ * - FEATURES HOOKS
+ *   uc_extra_fields_pane_features_api(), other features hooks are in
+ *   uc_extra_fields_pane.features.inc
+ *
  * - UCXF HOOKS
  *   Adds display options
  *
@@ -936,6 +940,25 @@ function uc_extra_fields_pane_views_api() {
 }
 
 // -------------------------------------------------------------------
+// FEATURES HOOKS
+// -------------------------------------------------------------------
+
+/**
+ * Implementation of hook_features_api().
+ */
+function uc_extra_fields_pane_features_api() {
+  return array(
+    'uc_extra_fields_pane_field' => array(
+      'name' => t('Extra Fields Pane field'),
+      'feature_source' => TRUE,
+      'default_hook' => 'uc_extra_fields_pane_default_fields',
+      'default_file' => FEATURES_DEFAULTS_INCLUDED,
+      'file' => drupal_get_path('module', 'uc_extra_fields_pane') . '/uc_extra_fields_pane.features.inc',
+    ),
+  );
+}
+
+// -------------------------------------------------------------------
 // UCXF HOOKS
 // -------------------------------------------------------------------