diff --git a/features.export.inc b/features.export.inc
index 37f772c..78820ff 100644
--- a/features.export.inc
+++ b/features.export.inc
@@ -317,7 +317,8 @@ function features_export_render($export, $module_name, $reset = FALSE) {
     $deprecated = array(
       "{$module_name}.defaults",
       "{$module_name}.features.views",
-      "{$module_name}.features.node"
+      "{$module_name}.features.node",
+      "{$module_name}.features.field"
     );
     foreach (file_scan_directory(drupal_get_path('module', $module_name), '/.*/') as $file) {
       if (in_array($file->name, $deprecated, TRUE)) {
diff --git a/includes/features.field.inc b/includes/features.field.inc
index c396668..d31f3ed 100644
--- a/includes/features.field.inc
+++ b/includes/features.field.inc
@@ -5,20 +5,37 @@
  */
 function field_features_api() {
   return array(
-    'field' => array(
-      'name' => t('Fields'),
-      'default_hook' => 'field_default_fields',
-      'default_file' => FEATURES_DEFAULTS_INCLUDED,
-      'feature_source' => TRUE,
-    )
+      'field_base' => array(
+          'name' => t('Field Bases'),
+          'default_hook' => 'field_default_field_bases',
+          'default_file' => FEATURES_DEFAULTS_INCLUDED,
+          'feature_source' => TRUE,
+      ),
+      'field_instance' => array(
+          'name' => t('Field Instances'),
+          'default_hook' => 'field_default_field_instances',
+          'default_file' => FEATURES_DEFAULTS_INCLUDED,
+          'feature_source' => TRUE,
+      )
   );
 }
 
+/**
+ * Implements hook_features_export_options().
+ */
+function field_base_features_export_options() {
+  $options = array();
+  $fields = field_info_fields();
+  foreach ($fields as $field_name => $field) {
+    $options[$field_name] = $field_name;
+  }
+  return $options;
+}
 
 /**
  * Implements hook_features_export_options().
  */
-function field_features_export_options() {
+function field_instance_features_export_options() {
   $options = array();
   $instances = field_info_instances();
   foreach ($instances as $entity_type => $bundles) {
@@ -35,42 +52,35 @@ function field_features_export_options() {
 /**
  * Implements hook_features_export().
  */
-function field_features_export($data, &$export, $module_name = '') {
+function field_base_features_export($data, &$export, $module_name = '') {
   $pipe = array();
-  $map = features_get_default_map('field');
+  $map = features_get_default_map('field_base');
 
-  // The field_default_fields() hook integration is provided by the
+  // The field_default_field_bases() hook integration is provided by the
   // features module so we need to add it as a dependency.
   $export['dependencies']['features'] = 'features';
 
   foreach ($data as $identifier) {
-    if ($field = features_field_load($identifier)) {
+    if ($base = features_field_base_load($identifier)) {
       // If this field is already provided by another module, remove the field
       // and add the other module as a dependency.
       if (isset($map[$identifier]) && $map[$identifier] != $module_name) {
-        if (isset($export['features']['field'][$identifier])) {
-          unset($export['features']['field'][$identifier]);
+        if (isset($export['features']['field_base'][$identifier])) {
+          unset($export['features']['field_base'][$identifier]);
         }
         $module = $map[$identifier];
         $export['dependencies'][$module] = $module;
       }
       // If the field has not yet been exported, add it
       else {
-        $export['features']['field'][$identifier] = $identifier;
-        $export['dependencies'][$field['field_config']['module']] = $field['field_config']['module'];
-        if ($field['field_config']['storage']['type'] != variable_get('field_storage_default', 'field_sql_storage')) {
-          $export['dependencies'][$field['field_config']['storage']['module']] = $field['field_config']['storage']['module'];
-        }
-        $export['dependencies'][$field['field_instance']['widget']['module']] = $field['field_instance']['widget']['module'];
-        foreach ($field['field_instance']['display'] as $key => $display) {
-          if (isset($display['module'])) {
-            $export['dependencies'][$display['module']] = $display['module'];
-            // @TODO: handle the pipe to image styles
-          }
+        $export['features']['field_base'][$identifier] = $identifier;
+        $export['dependencies'][$base['module']] = $base['module'];
+        if ($base['storage']['type'] != variable_get('field_storage_default', 'field_sql_storage')) {
+          $export['dependencies'][$base['storage']['module']] = $base['storage']['module'];
         }
         // If taxonomy field, add in the vocabulary
-        if ($field['field_config']['type'] == 'taxonomy_term_reference' && !empty($field['field_config']['settings']['allowed_values'])) {
-          foreach ($field['field_config']['settings']['allowed_values'] as $allowed_values) {
+        if ($base['type'] == 'taxonomy_term_reference' && !empty($base['settings']['allowed_values'])) {
+          foreach ($base['settings']['allowed_values'] as $allowed_values) {
             if (!empty($allowed_values['vocabulary'])) {
               $pipe['taxonomy'][] = $allowed_values['vocabulary'];
             }
@@ -83,59 +93,121 @@ function field_features_export($data, &$export, $module_name = '') {
 }
 
 /**
+ * Implements hook_features_export().
+ */
+function field_instance_features_export($data, &$export, $module_name = '') {
+  $pipe = array('field_base' => array());
+  $map = features_get_default_map('field_instance');
+
+  // The field_default_field_instances() hook integration is provided by the
+  // features module so we need to add it as a dependency.
+  $export['dependencies']['features'] = 'features';
+
+  foreach ($data as $identifier) {
+    if ($instance = features_field_instance_load($identifier)) {
+      // If this field is already provided by another module, remove the field
+      // and add the other module as a dependency.
+      if (isset($map[$identifier]) && $map[$identifier] != $module_name) {
+        if (isset($export['features']['field_instance'][$identifier])) {
+          unset($export['features']['field_instance'][$identifier]);
+        }
+        $module = $map[$identifier];
+        $export['dependencies'][$module] = $module;
+      }
+      // If the field has not yet been exported, add it
+      else {
+        $export['features']['field_instance'][$identifier] = $identifier;
+        $export['dependencies'][$instance['widget']['module']] = $instance['widget']['module'];
+        foreach ($instance['display'] as $key => $display) {
+          if (isset($display['module'])) {
+            $export['dependencies'][$display['module']] = $display['module'];
+            // @TODO: handle the pipe to image styles
+          }
+        }
+        $pipe['field_base'][] = $instance['field_name'];
+      }
+    }
+  }
+  return $pipe;
+}
+
+/**
  * Implements hook_features_export_render().
  */
-function field_features_export_render($module, $data, $export = NULL) {
+function field_base_features_export_render($module, $data, $export = NULL) {
   $translatables = $code = array();
-
-  $code[] = '  $fields = array();';
+  $code[] = '  $field_bases = array();';
   $code[] = '';
   foreach ($data as $identifier) {
-    if ($field = features_field_load($identifier)) {
-      unset($field['field_config']['columns']);
+    if ($field = features_field_base_load($identifier)) {
+      unset($field['columns']);
+      // unset($field['locked']);
       // Only remove the 'storage' declaration if the field is using the default
       // storage type.
-      if ($field['field_config']['storage']['type'] == variable_get('field_storage_default', 'field_sql_storage')) {
-        unset($field['field_config']['storage']);
+      if ($field['storage']['type'] == variable_get('field_storage_default', 'field_sql_storage')) {
+        unset($field['storage']);
       }
       // If we still have a storage declaration here it means that a non-default
       // storage type was altered into to the field definition. And noone would
       // never need to change the 'details' key, so don't render it.
-      if (isset($field['field_config']['storage']['details'])) {
-        unset($field['field_config']['storage']['details']);
+      if (isset($field['storage']['details'])) {
+        unset($field['storage']['details']);
       }
 
-      _field_features_export_sort($field);
+      _field_instance_features_export_sort($field);
       $field_export = features_var_export($field, '  ');
       $field_identifier = features_var_export($identifier);
-      $code[] = "  // Exported field: {$field_identifier}.";
-      $code[] = "  \$fields[{$field_identifier}] = {$field_export};";
+      $code[] = "  // Exported field_base: {$field_identifier}";
+      $code[] = "  \$field_bases[{$field_identifier}] = {$field_export};";
       $code[] = "";
+    }
+  }
+  $code[] = '  return $field_bases;';
+  $code = implode("\n", $code);
+  return array('field_default_field_bases' => $code);
+}
 
-      // Add label and description to translatables array.
-      if (!empty($field['field_instance']['label'])) {
-        $translatables[] = $field['field_instance']['label'];
+/**
+ * Implements hook_features_export_render().
+ */
+function field_instance_features_export_render($module, $data, $export = NULL) {
+  $translatables = $code = array();
+
+  $code[] = '  $field_instances = array();';
+  $code[] = '';
+
+  foreach ($data as $identifier) {
+    if ($instance = features_field_instance_load($identifier)) {
+      _field_instance_features_export_sort($instance);
+      $field_export = features_var_export($instance, '  ');
+      $instance_identifier = features_var_export($identifier);
+      $code[] = "  // Exported field_instance: {$instance_identifier}";
+      $code[] = "  \$field_instances[{$instance_identifier}] = {$field_export};";
+      $code[] = "";
+
+      if (!empty($instance['label'])) {
+        $translatables[] = $instance['label'];
       }
-      if (!empty($field['field_instance']['description'])) {
-        $translatables[] = $field['field_instance']['description'];
+      if (!empty($instance['description'])) {
+        $translatables[] = $instance['description'];
       }
     }
   }
   if (!empty($translatables)) {
     $code[] = features_translatables_export($translatables, '  ');
   }
-  $code[] = '  return $fields;';
+  $code[] = '  return $field_instances;';
   $code = implode("\n", $code);
-  return array('field_default_fields' => $code);
+  return array('field_default_field_instances' => $code);
 }
 
 // Helper to enforce consistency in field export arrays.
-function _field_features_export_sort(&$field, $sort = TRUE) {
+function _field_instance_features_export_sort(&$field, $sort = TRUE) {
 
   // Some arrays are not sorted to preserve order (for example allowed_values).
   static $sort_blacklist = array(
-    'allowed_values',
-    'format_handlers',
+      'allowed_values',
+      'format_handlers',
   );
 
   if ($sort) {
@@ -143,7 +215,7 @@ function _field_features_export_sort(&$field, $sort = TRUE) {
   }
   foreach ($field as $k => $v) {
     if (is_array($v)) {
-      _field_features_export_sort($field[$k], !in_array($k, $sort_blacklist));
+      _field_instance_features_export_sort($field[$k], !in_array($k, $sort_blacklist));
     }
   }
 }
@@ -151,39 +223,65 @@ function _field_features_export_sort(&$field, $sort = TRUE) {
 /**
  * Implements hook_features_revert().
  */
-function field_features_revert($module) {
-  field_features_rebuild($module);
+function field_base_features_revert($module) {
+  field_base_features_rebuild($module);
+}
+
+/**
+ * Implements hook_features_revert().
+ */
+function field_instance_features_revert($module) {
+  field_instance_features_rebuild($module);
 }
 
 /**
  * Implements of hook_features_rebuild().
  * Rebuilds fields from code defaults.
  */
-function field_features_rebuild($module) {
-  if ($fields = features_get_default('field', $module)) {
+function field_base_features_rebuild($module) {
+  if ($fields = features_get_default('field_base', $module)) {
     field_info_cache_clear();
 
-    // Load all the existing fields and instance up-front so that we don't
+    // Load all the existing field bases up-front so that we don't
     // have to rebuild the cache all the time.
     $existing_fields = field_info_fields();
-    $existing_instances = field_info_instances();
 
     foreach ($fields as $field) {
       // Create or update field.
-      $field_config = $field['field_config'];
-      if (isset($existing_fields[$field_config['field_name']])) {
-        $existing_field = $existing_fields[$field_config['field_name']];
-        if ($field_config + $existing_field != $existing_field) {
-          field_update_field($field_config);
+      if (isset($existing_fields[$field['field_name']])) {
+        $existing_field = $existing_fields[$field['field_name']];
+        if ($field + $existing_field != $existing_field) {
+          field_update_field($field);
         }
       }
       else {
-        field_create_field($field_config);
-        $existing_fields[$field_config['field_name']] = $field_config;
+        field_create_field($field);
+        $existing_fields[$field['field_name']] = $field;
+      }
+      variable_set('menu_rebuild_needed', TRUE);
+    }
+  }
+}
+
+/**
+ * Implements of hook_features_rebuild().
+ * Rebuilds field instances from code defaults.
+ */
+function field_instance_features_rebuild($module) {
+  if ($instances = features_get_default('field_instance', $module)) {
+    field_info_cache_clear();
+
+    // Load all the existing instances up-front so that we don't
+    // have to rebuild the cache all the time.
+    $existing_instances = field_info_instances();
+
+    foreach ($instances as $field_instance) {
+      // If the field base information does not exist yet, cancel out.
+      if (!field_info_field($field_instance['field_name'])) {
+        continue;
       }
 
       // Create or update field instance.
-      $field_instance = $field['field_instance'];
       if (isset($existing_instances[$field_instance['entity_type']][$field_instance['bundle']][$field_instance['field_name']])) {
         $existing_instance = $existing_instances[$field_instance['entity_type']][$field_instance['bundle']][$field_instance['field_name']];
         if ($field_instance + $existing_instance != $existing_instance) {
@@ -196,29 +294,34 @@ function field_features_rebuild($module) {
       }
     }
 
-    if ($fields) {
+    if ($instances) {
       variable_set('menu_rebuild_needed', TRUE);
     }
   }
 }
 
 /**
- * Load a field's configuration and instance configuration by an
- * entity_type-bundle-field_name identifier.
+ * Load a field base configuration by a field_name identifier.
  */
-function features_field_load($identifier) {
-  list($entity_type, $bundle, $field_name) = explode('-', $identifier);
-  $field_info = field_info_field($field_name);
-  $instance_info = field_info_instance($entity_type, $field_name, $bundle);
-  if ($field_info && $instance_info) {
+function features_field_base_load($field_name) {
+  if ($field_info = field_info_field($field_name)) {
     unset($field_info['id']);
     unset($field_info['bundles']);
+    return $field_info;
+  }
+  return FALSE;
+}
+
+/**
+ * Load a field's instance configuration by an entity_type-bundle-field_name
+ * identifier.
+ */
+function features_field_instance_load($identifier) {
+  list($entity_type, $bundle, $field_name) = explode('-', $identifier);
+  if ($instance_info = field_info_instance($entity_type, $field_name, $bundle)) {
     unset($instance_info['id']);
     unset($instance_info['field_id']);
-    return array(
-      'field_config' => $field_info,
-      'field_instance' => $instance_info,
-    );
+    return $instance_info;
   }
   return FALSE;
 }
diff --git a/tests/features.test b/tests/features.test
index 8da66a3..907e74d 100644
--- a/tests/features.test
+++ b/tests/features.test
@@ -45,7 +45,6 @@ class FeaturesUserTestCase extends DrupalWebTestCase {
     module_load_include('inc', 'features', 'features.export');
 
     $components = array_filter(array(
-      'field' => 'field',
       'filter' => 'filter',
       'image' => 'image',
       'node' => 'node',
@@ -53,6 +52,8 @@ class FeaturesUserTestCase extends DrupalWebTestCase {
       'views_view' => 'views',
     ), 'module_exists');
 
+    $this->_test_field();
+
     foreach (array_keys($components) as $component) {
       $callback = "_test_{$component}";
 
@@ -85,7 +86,47 @@ class FeaturesUserTestCase extends DrupalWebTestCase {
     }
   }
 
-  protected function _test_field($op = 'load') {
+  protected function _test_field () {
+        $base = $this->_test_field_base('load');
+        $this->assertTrue(!empty($base), t('@component present.', array('@component' => 'field_base')));
+
+        $instance = $this->_test_field_instance('load');
+        $this->assertTrue(!empty($instance), t('@component present.', array('@component' => 'field_instance')));
+
+        $states = features_get_component_states(array('features_test'), FALSE, TRUE);
+        $this->assertTrue($states['features_test']['field_base'] === FEATURES_DEFAULT, t('@component state: Default.', array('@component' => 'field_base')));
+        $this->assertTrue($states['features_test']['field_instance'] === FEATURES_DEFAULT, t('@component state: Default.', array('@component' => 'field_instance')));
+
+        $this->_test_field_base('override', $this);
+        $this->_test_field_instance('override', $this);
+        $states = features_get_component_states(array('features_test'), FALSE, TRUE);
+        $this->assertTrue($states['features_test']['field_base'] === FEATURES_OVERRIDDEN, t('@component state: Overridden.', array('@component' => 'field_base')));
+        $this->assertTrue($states['features_test']['field_instance'] === FEATURES_OVERRIDDEN, t('@component state: Overridden.', array('@component' => 'field_instance')));
+
+        features_revert(array('features_test' => array('field_base', 'field_instance')));
+        drupal_flush_all_caches();
+
+        $base = $this->_test_field_base('load');
+        $instance = $this->_test_field_instance('load');
+
+        $states = features_get_component_states(array('features_test'), FALSE, TRUE);
+        $this->assertTrue($states['features_test']['field_base'] === FEATURES_DEFAULT, t('@component state: Default.', array('@component' => 'field_base')));
+        $this->assertTrue($states['features_test']['field_instance'] === FEATURES_DEFAULT, t('@component state: Default.', array('@component' => 'field_instance')));
+  }
+
+  protected function _test_field_base($op = 'load') {
+    switch ($op) {
+      case 'load':
+        return field_info_field('field_features_test');
+      case 'override':
+        $field_base = field_info_field('field_features_test');
+        $field_base['cardinality'] = '-1';
+        field_update_field($field_base);
+        break;
+    }
+  }
+
+  protected function _test_field_instance($op = 'load') {
     switch ($op) {
       case 'load':
         return field_info_instance('node', 'field_features_test', 'features_test');
diff --git a/tests/features_test.features.field.inc b/tests/features_test.features.field.inc
deleted file mode 100644
index 6b18fa9..0000000
--- a/tests/features_test.features.field.inc
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * @file
- * features_test.features.field.inc
- */
-
-/**
- * Implements hook_field_default_fields().
- */
-function features_test_field_default_fields() {
-  $fields = array();
-
-  // Exported field: 'node-features_test-field_features_test'
-  $fields['node-features_test-field_features_test'] = array(
-    'field_config' => array(
-      'active' => '1',
-      'cardinality' => '1',
-      'deleted' => '0',
-      'entity_types' => array(),
-      'field_name' => 'field_features_test',
-      'foreign keys' => array(
-        'format' => array(
-          'columns' => array(
-            'format' => 'format',
-          ),
-          'table' => 'filter_format',
-        ),
-      ),
-      'indexes' => array(
-        'format' => array(
-          0 => 'format',
-        ),
-      ),
-      'module' => 'text',
-      'settings' => array(
-        'max_length' => '255',
-      ),
-      'translatable' => '1',
-      'type' => 'text',
-    ),
-    'field_instance' => array(
-      'bundle' => 'features_test',
-      'default_value' => NULL,
-      'deleted' => '0',
-      'description' => '',
-      'display' => array(
-        'default' => array(
-          'label' => 'above',
-          'module' => 'text',
-          'settings' => array(),
-          'type' => 'text_default',
-          'weight' => 0,
-        ),
-        'full' => array(
-          'label' => 'above',
-          'settings' => array(),
-          'type' => 'hidden',
-          'weight' => 0,
-        ),
-        'print' => array(
-          'label' => 'above',
-          'settings' => array(),
-          'type' => 'hidden',
-          'weight' => 0,
-        ),
-        'rss' => array(
-          'label' => 'above',
-          'settings' => array(),
-          'type' => 'hidden',
-          'weight' => 0,
-        ),
-        'teaser' => array(
-          'label' => 'above',
-          'settings' => array(),
-          'type' => 'hidden',
-          'weight' => 0,
-        ),
-      ),
-      'entity_type' => 'node',
-      'field_name' => 'field_features_test',
-      'label' => 'Test',
-      'required' => 0,
-      'settings' => array(
-        'text_processing' => '0',
-        'user_register_form' => FALSE,
-      ),
-      'widget' => array(
-        'active' => 1,
-        'module' => 'text',
-        'settings' => array(
-          'size' => '60',
-        ),
-        'type' => 'text_textfield',
-        'weight' => '-4',
-      ),
-    ),
-  );
-
-  // Translatables
-  // Included for use with string extractors like potx.
-  t('Test');
-
-  return $fields;
-}
diff --git a/tests/features_test.features.field_base.inc b/tests/features_test.features.field_base.inc
new file mode 100644
index 0000000..fc5c554
--- /dev/null
+++ b/tests/features_test.features.field_base.inc
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @file
+ * features_test.features.field_base.inc
+ */
+
+/**
+ * Implements hook_field_default_field_bases().
+ */
+function features_test_field_default_field_bases() {
+  $field_bases = array();
+
+  // Exported field_base: 'field_features_test'
+  $field_bases['field_features_test'] = array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_features_test',
+      'foreign keys' => array(
+          'format' => array(
+              'columns' => array(
+                  'format' => 'format',
+              ),
+              'table' => 'filter_format',
+          ),
+      ),
+      'indexes' => array(
+          'format' => array(
+              0 => 'format',
+          ),
+      ),
+      'module' => 'text',
+      'settings' => array(
+          'max_length' => '255',
+      ),
+      'translatable' => '1',
+      'type' => 'text',
+  );
+
+  return $field_bases;
+}
\ No newline at end of file
diff --git a/tests/features_test.features.field_instance.inc b/tests/features_test.features.field_instance.inc
new file mode 100644
index 0000000..6194b0e
--- /dev/null
+++ b/tests/features_test.features.field_instance.inc
@@ -0,0 +1,76 @@
+<?php
+/**
+ * @file
+ * features_test.features.field_instance.inc
+ */
+
+/**
+ * Implements hook_field_default_field_instances().
+ */
+function features_test_field_default_field_instances() {
+  $field_instances = array();
+
+  // Exported field_instance: 'node-features_test-field_features_test'
+  $field_instances['node-features_test-field_features_test'] = array(
+    'bundle' => 'features_test',
+    'default_value' => NULL,
+    'deleted' => '0',
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 0,
+      ),
+      'full' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'print' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'rss' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'node',
+    'field_name' => 'field_features_test',
+    'label' => 'Test',
+    'required' => 0,
+    'settings' => array(
+      'text_processing' => '0',
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'text',
+      'settings' => array(
+        'size' => '60',
+      ),
+      'type' => 'text_textfield',
+      'weight' => '-4',
+    ),
+  );
+
+  // Translatables
+  // Included for use with string extractors like potx.
+  t('Test');
+
+  return $field_instances;
+}
\ No newline at end of file
diff --git a/tests/features_test.info b/tests/features_test.info
index 59538bd..6f26d7b 100644
--- a/tests/features_test.info
+++ b/tests/features_test.info
@@ -11,7 +11,8 @@ dependencies[] = views
 features[ctools][] = strongarm:strongarm:1
 features[ctools][] = views:views_default:3.0
 features[features_api][] = api:1
-features[field][] = node-features_test-field_features_test
+features[field_base][] = field_features_test
+features[field_instance][] = node-features_test-field_features_test
 features[filter][] = features_test
 features[image][] = features_test
 features[node][] = features_test