diff --git a/Provision/Config/Drupal/Settings.php b/Provision/Config/Drupal/Settings.php
index b556894..434757b 100644
--- a/Provision/Config/Drupal/Settings.php
+++ b/Provision/Config/Drupal/Settings.php
@@ -21,6 +21,15 @@ class Provision_Config_Drupal_Settings extends Provision_Config {
       $this->data['file_directory_temp_var'] = 'file_temporary_path';
       $this->data['file_directory_private_var'] = 'file_private_path';
       $this->data['drupal_hash_salt_var'] = 'empty';
+
+      // Multi-byte UTF-8 support in Drupal 7
+      // https://www.drupal.org/node/2754539
+      //drush_sql_bootstrap_database_configuration();
+      $connection = Database::getConnection();
+      if (method_exists($connection, 'utf8mb4IsSupported') && $connection->utf8mb4IsSupported()) {
+        $this->data['utf8mb4IsSupported'] = TRUE;
+      }
+
     }
     else {
       $this->data['file_directory_path_var'] = 'file_directory_path';
diff --git a/Provision/Config/Drupal/provision_drupal_settings_7.tpl.php b/Provision/Config/Drupal/provision_drupal_settings_7.tpl.php
index 9e8dc81..f8c3706 100644
--- a/Provision/Config/Drupal/provision_drupal_settings_7.tpl.php
+++ b/Provision/Config/Drupal/provision_drupal_settings_7.tpl.php
@@ -48,6 +48,12 @@ if (isset($_SERVER['db_name'])) {
      * should probably be fixed in Drush.
      */
     'port' => (string) $_SERVER['db_port'],
+    <?php if ($utf8mb4IsSupported): ?>
+    'charset' => 'utf8mb4',
+    'collation' => 'utf8mb4_general_ci',
+<?php else ?>
+// dummy ... not adding utf8mb4
+    <?php endif; ?>
   );
   $db_url['default'] = $_SERVER['db_type'] . '://' . $_SERVER['db_user'] . ':' . $_SERVER['db_passwd'] . '@' . $_SERVER['db_host'] . ':' . $_SERVER['db_port'] . '/' . $_SERVER['db_name'];
 }
diff --git a/Provision/Config/Drupal/provision_drupal_settings_8.tpl.php b/Provision/Config/Drupal/provision_drupal_settings_8.tpl.php
index 4d33126..041bb5e 100644
--- a/Provision/Config/Drupal/provision_drupal_settings_8.tpl.php
+++ b/Provision/Config/Drupal/provision_drupal_settings_8.tpl.php
@@ -48,6 +48,7 @@ if (isset($_SERVER['db_name'])) {
      * should probably be fixed in Drush.
      */
     'port' => (string) $_SERVER['db_port'],
+    'collation' => 'utf8mb4_general_ci',
   );
   $db_url['default'] = $_SERVER['db_type'] . '://' . $_SERVER['db_user'] . ':' . $_SERVER['db_passwd'] . '@' . $_SERVER['db_host'] . ':' . $_SERVER['db_port'] . '/' . $_SERVER['db_name'];
 }