diff --git a/ChangeLog b/ChangeLog
index 225553897..51110893e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ $Source$
       $cfg['PmaNoRelation_DisableWarning'] to the backwards compatibility code.
     * config.inc.php3, Documentation.html: Remerged the changes that were
       removed in the previous revision, thanks to Björn T. Hallberg (bth).
+    * libraries/select_lang.lib.php3: Disable UTF-8 if
+      $cfg['AllowAnywhereRecoding'] has been set to FALSE.
 
 2002-07-16 Mike Beck <mikebeck@users.sourceforge.net>
     * pdf_pages.php3: if a page is edit it can also be shown
diff --git a/libraries/select_lang.lib.php3 b/libraries/select_lang.lib.php3
index 8e6285fbe..ed3c5439c 100644
--- a/libraries/select_lang.lib.php3
+++ b/libraries/select_lang.lib.php3
@@ -207,15 +207,28 @@ if (!isset($lang)) {
  */
 
 // compatibility with config.inc.php3 <= v1.80
-if (isset($cfgLang)) {
+if (!isset($cfg['Lang']) && isset($cfgLang)) {
     $cfg['Lang']        = $cfgLang;
     unset($cfgLang);
 }
-if (isset($cfgDefaultLang)) {
+if (!isset($cfg['DefaultLang']) && isset($cfgDefaultLang)) {
     $cfg['DefaultLang'] = $cfgDefaultLang;
     unset($cfgLang);
 }
 
+// Disable UTF-8 if $cfg['AllowAnywhereRecoding'] has been set to FALSE.
+if (!isset($cfg['AllowAnywhereRecoding']) || !$cfg['AllowAnywhereRecoding']) {
+    $available_language_files = $available_languages;
+    $available_languages = array();
+    foreach ($available_language_files as $tmp_lang => $tmp_lang_data) {
+        if (substr($tmp_lang, -5) != 'utf-8') {
+            $available_languages[$tmp_lang] = $tmp_lang_data;
+        }
+    }
+    unset($tmp_lang);
+    unset($tmp_lang_data);
+    unset($available_language_files);
+}
 
 // Lang forced
 if (!empty($cfg['Lang'])) {