diff --git a/main/inc/lib/multibyte_string_functions.lib.php b/main/inc/lib/multibyte_string_functions.lib.php
index b2f7e2405e..4855bf0bfd 100644
--- a/main/inc/lib/multibyte_string_functions.lib.php
+++ b/main/inc/lib/multibyte_string_functions.lib.php
@@ -1021,6 +1021,7 @@ function & api_non_utf8_encodings() {
 	static $encodings =
 '
 arabic: WINDOWS-1256, ISO-8859-6;
+asturian: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
 bosnian: WINDOWS-1250;
 brazilian: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
 bulgarian: WINDOWS-1251;
@@ -1028,38 +1029,50 @@ catalan: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
 croatian: WINDOWS-1250;
 czech: WINDOWS-1250, ISO-8859-2;
 danish: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
+dari: WINDOWS-1256;
 dutch: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
 english: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
+euskera:  ISO-8859-15, WINDOWS-1252, ISO-8859-1;
 esperanto: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
 finnish: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
 french: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
+friulian: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
 galician: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
+georgian: GEORGIAN-ACADEMY, GEORGIAN-PS;
 german: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
-greek: ISO-8859-7, WINDOWS-1253;
+greek: WINDOWS-1253, ISO-8859-7;
 hebrew: ISO-8859-8, WINDOWS-1255;
-hungarian: ISO-8859-2;
+hungarian: WINDOWS-1250, ISO-8859-2;
 indonesian: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
 italian: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
-japanese: EUC-JP, ISO-2022-JP;
-korean: EUC-KR, CP949, ISO-2022-KR;
+japanese: EUC-JP, ISO-2022-JP, Shift-JIS, SJIS-2004;
+korean: EUC-KR, ISO-2022-KR, CP949;
+latvian: WINDOWS-1257, ISO-8859-13;
+lithuanian: WINDOWS-1257, ISO-8859-13;
+macedonian: WINDOWS-1251;
 malay: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
 norwegian: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
-persian: WINDOWS-1252;
-polish: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
+occitan: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
+pashto: WINDOWS-1256;
+persian: WINDOWS-1256;
+polish: WINDOWS-1250, ISO-8859-2;
 portuguese: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
+quechua_cusco: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
+romanian: WINDOWS-1250, ISO-8859-2;
 russian: KOI8-R, WINDOWS-1251;
-serbian: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
+serbian: ISO-8859-15, WINDOWS-1252, ISO-8859-1, WINDOWS-1251;
 simpl_chinese: GB2312, WINDOWS-936;
-slovak: WINDOWS-1250;
-slovenian: WINDOWS-1250;
+slovak: WINDOWS-1250, ISO-8859-2;
+slovenian: WINDOWS-1250, ISO-8859-2;
 spanish: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
 swahili: ISO-8859-1;
 swedish: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
-thai: ISO-8859-11, WINDOWS-874;
+thai: WINDOWS-874, ISO-8859-11;
 trad_chinese: BIG-5, EUC-TW;
-turkce: ISO-8859-9, WINDOWS-1254;
+turkce: WINDOWS-1254, ISO-8859-9;
 ukrainian: KOI8-U;
-vietnamese: WINDOWS-1258;
+vietnamese: WINDOWS-1258, VISCII, VPS, VIQR, TCVN, VNI;
+yoruba: ISO-8859-15, WINDOWS-1252, ISO-8859-1;
 ';
 
 	if (!is_array($encodings)) {