diff --git a/core/lib/Drupal/Core/Config/MultiStorage.php b/core/lib/Drupal/Core/Config/MultiStorage.php
new file mode 100644
index 0000000..3b0591a
--- /dev/null
+++ b/core/lib/Drupal/Core/Config/MultiStorage.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\Config\MultiStorage.
+ */
+
+namespace Drupal\Core\Config;
+
+/**
+ * Defines a storage controller that wraps multiple others.
+ *
+ * This storage controller has no actual storage attached to itself, but rather
+ * forwards the operations to one or more other storage controllers, depending
+ * on the operation being performed.
+ *
+ * The options define which other storage controllers are used, along with their
+ * respective options.
+ *
+ * Only the first defined storage controller is used for reading configuration.
+ * All writes and deletes are performed on all storage controllers.
+ */
+class MultiStorage implements StorageInterface {
+
+  /**
+   * The configuration options for the sub-storage controllers.
+   *
+   * An associative array whose keys are the class names of the storage
+   * controllers to use, and whose values are the respective configuration
+   * options for each storage controller.
+   *
+   * @var array
+   */
+  protected $options;
+
+  /**
+   * The instantiated sub-storage controllers.
+   *
+   * @var array
+   */
+  protected $storages = array();
+
+  /**
+   * Implements Drupal\Core\Config\StorageInterface::__construct().
+   */
+  public function __construct(array $options = array()) {
+    foreach ($options as $storage_controller => $storage_options) {
+      $this->storages[] = new $storage_controller($storage_options);
+    }
+    $this->options = $options;
+  }
+
+  /**
+   * Implements Drupal\Core\Config\StorageInterface::read().
+   */
+  public function read($name) {
+    return $this->storages[0]->read($name);
+  }
+
+  /**
+   * Implements Drupal\Core\Config\StorageInterface::write().
+   */
+  public function write($name, array $data) {
+    $success = TRUE;
+    foreach ($this->storages as $storage) {
+      if (!$storage->write($name, $data)) {
+        $success = FALSE;
+      }
+    }
+    return $success;
+  }
+
+  /**
+   * Implements Drupal\Core\Config\StorageInterface::delete().
+   */
+  public function delete($name) {
+    $success = TRUE;
+    foreach ($this->storages as $storage) {
+      if (!$storage->delete($name)) {
+        $success = FALSE;
+      }
+    }
+    return $success;
+  }
+
+  /**
+   * Implements Drupal\Core\Config\StorageInterface::encode().
+   *
+   * @todo Remove encode() from StorageInterface.
+   */
+  public static function encode($data) {
+    return $this->storages[0]->encode($data);
+  }
+
+  /**
+   * Implements Drupal\Core\Config\StorageInterface::decode().
+   *
+   * @todo Remove decode() from StorageInterface.
+   */
+  public static function decode($raw) {
+    return $this->storages[0]->decode($raw);
+  }
+
+  /**
+   * Implements Drupal\Core\Config\StorageInterface::listAll().
+   */
+  public function listAll($prefix = '') {
+    return $this->storages[0]->listAll($prefix);
+  }
+}
diff --git a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
index fc76eb6..75ad8d5 100644
--- a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
+++ b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
@@ -49,10 +49,15 @@ class ContainerBuilder extends BaseContainerBuilder {
     //   bootstrap configuration *file* to allow to set/override this very
     //   lowest of low level configuration.
     $this->setParameter('config.storage.options', array(
-      'connection' => 'default',
-      'target' => 'default',
+      'Drupal\Core\Config\DatabaseStorage' => array(
+        'connection' => 'default',
+        'target' => 'default',
+      ),
+      'Drupal\Core\Config\FileStorage' => array(
+        'directory' => config_get_config_directory(),
+      ),
     ));
-    $this->register('config.storage', 'Drupal\Core\Config\DatabaseStorage')
+    $this->register('config.storage', 'Drupal\Core\Config\MultiStorage')
       ->addArgument('%config.storage.options%');
 
     // Register configuration object factory.