diff --git a/ChangeLog b/ChangeLog
index 234c75c251..92fcecc2b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog
 - bug #4679 Setup does not allow providing a name for favorites table
 - bug #4680 Number of favorite table are not configurable in setup
 - bug #4681 'Central columns table' field in setup does not have a description
+- bug #4318 Default connection collation and sorting
 
          --- Older ChangeLogs can be found on our project website ---
                      http://www.phpmyadmin.net/old-stuff/ChangeLogs/
diff --git a/libraries/config.default.php b/libraries/config.default.php
index be860b917d..60cf9e43ec 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2417,7 +2417,7 @@ $cfg['DefaultLang'] = 'en';
  *
  * @global string $cfg['DefaultConnectionCollation']
  */
-$cfg['DefaultConnectionCollation'] = 'utf8_general_ci';
+$cfg['DefaultConnectionCollation'] = 'utf8_unicode_ci';
 
 /**
  * Force: always use this language