diff --git a/core/includes/install.inc b/core/includes/install.inc
index 69b421a..9bd6f1d 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -426,7 +426,18 @@ function _drupal_rewrite_settings_dump($variable, $variable_name) {
  *   into settings.php.
  */
 function _drupal_rewrite_settings_dump_one(\stdClass $variable, $prefix = '', $suffix = '') {
-  $return = $prefix . var_export($variable->value, TRUE) . ';';
+  // Add special handling for the $databases setting to improve readability and to
+  // match the format of the database settings documentation in settings.php.
+  if ($prefix == '$databases = ') {
+    foreach ($variable->value as $db_name => $db_roles) {
+      foreach ($db_roles as $db_role => $values) {
+        $return = '$databases[' . var_export($db_name, TRUE) . '][' . var_export($db_role, TRUE) . '] = ' . var_export($values, TRUE) . ';';
+      }
+    }
+  }
+  else {
+    $return = $prefix . var_export($variable->value, TRUE) . ';';  
+  }
   if (!empty($variable->comment)) {
     $return .= ' // ' . $variable->comment;
   }
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index ab85646..ee33ffd 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -64,12 +64,12 @@
  * similar to the following:
  * @code
  * array(
- *   'driver' => 'mysql',
  *   'database' => 'databasename',
  *   'username' => 'username',
  *   'password' => 'password',
  *   'host' => 'localhost',
  *   'port' => 3306,
+ *   'driver' => 'mysql',
  *   'prefix' => 'myprefix_',
  *   'collation' => 'utf8_general_ci',
  * );
@@ -116,11 +116,11 @@
  * For a single database configuration, the following is sufficient:
  * @code
  * $databases['default']['default'] = array(
- *   'driver' => 'mysql',
  *   'database' => 'databasename',
  *   'username' => 'username',
  *   'password' => 'password',
  *   'host' => 'localhost',
+ *   'driver' => 'mysql',
  *   'prefix' => 'main_',
  *   'collation' => 'utf8_general_ci',
  * );
@@ -191,24 +191,27 @@
  * Database configuration format:
  * @code
  *   $databases['default']['default'] = array(
- *     'driver' => 'mysql',
  *     'database' => 'databasename',
  *     'username' => 'username',
  *     'password' => 'password',
  *     'host' => 'localhost',
+ *     'port' => '',
+ *     'driver' => 'mysql',
  *     'prefix' => '',
  *   );
  *   $databases['default']['default'] = array(
- *     'driver' => 'pgsql',
  *     'database' => 'databasename',
  *     'username' => 'username',
  *     'password' => 'password',
  *     'host' => 'localhost',
+ *     'port' => '',
+ *     'driver' => 'pgsql',
  *     'prefix' => '',
  *   );
  *   $databases['default']['default'] = array(
- *     'driver' => 'sqlite',
  *     'database' => '/path/to/databasefilename',
+ *     'driver' => 'sqlite',
+ *     'prefix' => '',
  *   );
  * @endcode
  */