diff --git a/configuration.module b/configuration.module
index cf0bd5d..8936b60 100644
--- a/configuration.module
+++ b/configuration.module
@@ -39,6 +39,7 @@ function configuration_configuration_handlers() {
     'menu'         => '\Drupal\configuration\Config\MenuConfiguration',
     'menu_link'    => '\Drupal\configuration\Config\MenuLinkConfiguration',
     'ctools'       => '\Drupal\configuration\Config\CtoolsConfiguration',
+    'entity'       => '\Drupal\configuration\Config\EntityApiConfiguration',
     'views'        => '\Drupal\configuration\Config\ViewConfiguration',
     'strongarm'    => '\Drupal\configuration\Config\StrongarmConfiguration',
     'page_manager' => '\Drupal\configuration\Config\PageManagerHandlerConfiguration',
diff --git a/lib/Drupal/configuration/Config/EntityApiConfiguration.php b/lib/Drupal/configuration/Config/EntityApiConfiguration.php
new file mode 100644
index 0000000..f6af04f
--- /dev/null
+++ b/lib/Drupal/configuration/Config/EntityApiConfiguration.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\configuration\Config\EntityApiConfiguration.
+ */
+
+namespace Drupal\configuration\Config;
+
+use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Utils\ConfigIteratorSettings;
+
+class EntityApiConfiguration extends Configuration {
+
+  /**
+   * The component of the current configuration.
+   *
+   * Usually this component is the entity type.
+   *
+   * @var string
+   */
+  protected $component;
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::__construct().
+   */
+  public function __construct($identifier, $component = '') {
+    // Because Entity API can handle multiple types of configurations we need to
+    // know what is the current handled configuration. Usually this component is
+    // the entity type.
+    $this->component = $component;
+    parent::__construct($identifier, $component);
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::getStorageSystem().
+   */
+  static protected function getStorageSystem($component) {
+    return '\Drupal\configuration\Storage\StorageEntityApi';
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::getStorageInstance().
+   */
+  static protected function getStorageInstance($component) {
+    $storage = static::getStorageSystem($component);
+    return new $storage($component);
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::isActive().
+   */
+  public static function isActive() {
+    if (module_exists('entity')) {
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::getComponentHumanName().
+   */
+  static public function getComponentHumanName($component, $plural = FALSE) {
+    $entity_info = entity_crud_get_info();
+    if ($plural && !empty($entity_info[$component]['plural_label'])) {
+      return $entity_info[$component]['plural_label'];
+    }
+    else {
+      return $entity_info[$component]['label'];
+    }
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::getComponent().
+   */
+  public function getComponent() {
+    return $this->component;
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::supportedComponents().
+   */
+  static public function supportedComponents() {
+    $supported = array();
+    foreach (entity_crud_get_info() as $type => $info) {
+      if (!empty($info['exportable'])) {
+        $supported[] = $type;
+      }
+    }
+    return $supported;
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::getAllIdentifiers().
+   */
+  public static function getAllIdentifiers($component) {
+    $options = array();
+    foreach (entity_load_multiple_by_name($component, FALSE) as $name => $entity) {
+      $options[$name] = entity_label($component, $entity);
+    }
+    return $options;
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::configForEntity().
+   */
+  public function configForEntity() {
+    return TRUE;
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::getEntityType().
+   */
+  public function getEntityType() {
+    $entity = entity_load_single($this->getComponent(), $this->getIdentifier());
+    $info = $entity->entityInfo();
+    if (!empty($info['bundle of'])) {
+      return $info['bundle of'];
+    }
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::findRequiredModules().
+   */
+  public function findRequiredModules() {
+    $this->addToModules('entity');
+    $entity_info = entity_get_info($this->getComponent());
+    if ($entity_info) {
+      $this->addToModules($entity_info['module']);
+    }
+  }
+
+  /**
+   * Implements Drupal\configuration\Config\Configuration::prepareBuild().
+   */
+  public function prepareBuild() {
+    $entity_type = $this->getComponent();
+    $this->data = entity_load_single($entity_type, $this->getIdentifier());
+    return $this;
+  }
+
+  /**
+   * Implements Drupal\configuration\Config\Configuration::saveToActiveStore().
+   */
+  public function saveToActiveStore(ConfigIteratorSettings &$settings) {
+    $entity = $this->getData();
+    $entity_type = $this->getComponent();
+    if ($original = entity_load_single($entity_type, $this->getIdentifier())) {
+      entity_delete($entity_type, $this->getIdentifier());
+    }
+
+    $entity->save();
+    $settings->addInfo('imported', $this->getUniqueId());
+  }
+}
diff --git a/lib/Drupal/configuration/Storage/StorageEntityApi.php b/lib/Drupal/configuration/Storage/StorageEntityApi.php
new file mode 100644
index 0000000..70715ae
--- /dev/null
+++ b/lib/Drupal/configuration/Storage/StorageEntityApi.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\configuration\Storage\StorageEntityApi.
+ */
+
+namespace Drupal\configuration\Storage;
+
+use Drupal\configuration\Storage\StoragePhp;
+
+class StorageEntityApi extends StoragePHP {
+
+  // The class that storages the data of the configuration
+  protected $entity_type;
+
+  public function __construct($entity_type) {
+    parent::__construct();
+    $this->entity_type = $entity_type;
+  }
+
+  /**
+   * Saves the configuration object into the DataStore.
+   */
+  public function getDataToSave() {
+
+    $filename = $this->filename;
+
+    $export = '$api = ' . $this->export($this->api_version) . ";\n\n";
+    $export .= '$data = entity_import(\'' . $this->entity_type . "', '" . addcslashes(entity_export($this->entity_type, $this->data, '  '), '\\\'') . "');\n\n";
+    $export .= '$dependencies = ' . $this->export($this->dependencies) . ";\n\n";
+    $export .= '$optional = ' . $this->export($this->optional_configurations) . ";\n\n";
+    $export .= '$modules = ' . $this->export($this->required_modules) . ";";
+
+    $file_contents = "<?php\n/**\n * @file\n * {$filename}\n */\n\n" . $export . "\n";
+
+    $this->hash = sha1($file_contents);
+
+    return $file_contents;
+  }
+
+}