diff --git a/e107_plugins/tinymce4/wysiwyg.php b/e107_plugins/tinymce4/wysiwyg.php
index cdd3fd7de..dd217b913 100644
--- a/e107_plugins/tinymce4/wysiwyg.php
+++ b/e107_plugins/tinymce4/wysiwyg.php
@@ -218,27 +218,94 @@ class wysiwyg
 	function tinymce_lang()
 	{
 		$lang = e_LANGUAGE;
+
+		// Languages supported by TinyMce.
+		// Commented out languages are not found in e107's language_class.php.
 		$tinylang = array(
-			"Arabic"    => "ar",
-			"Bulgarian" => "bg_BG",
-			"Danish"    => "da",
-			"Dutch"     => "nl",
-			"English"   => "en",
-			"Persian"   => "fa",
-			"French"    => "fr_FR",
-			"German"    => "de",
-			"Greek"     => "el",
-			"Hebrew"    => "he_IL",
-			"Hungarian" => "hu_HU",
-			"Italian"   => "it",
-			"Japanese"  => "ja",
-			"Korean"    => "ko",
-			"Norwegian" => "nb_NO",
-			"Polish"    => "pl",
-			"Russian"   => "ru",
-			"Slovak"    => "sk",
-			"Spanish"   => "es",
-			"Swedish"   => "sv_SE",
+			'Arabic'        => 'ar',
+			// 'Arabic (Saudi Arabia)' => 'ar_SA',
+			'Armenian'      => 'hy',
+			'Azerbaijani'   => 'az',
+			'Basque'        => 'eu',
+			'Belarusian'    => 'be',
+			'Bengali'       => 'bn_BD',
+			'Bosnian'       => 'bs',
+			'Bulgarian'     => 'bg_BG',
+			'Catalan'       => 'ca',
+			// 'Chinese (China)' => 'zh_CN',
+			// 'Chinese (Taiwan)' => 'zh_TW',
+			'Croatian'      => 'hr',
+			'Czech'         => 'cs',
+			// 'Czech (Czech Republic)' => 'cs_CZ',
+			'Danish'        => 'da',
+			// 'Divehi' => 'dv',
+			'Dutch'         => 'nl',
+			'English'       => 'en', // Default language file.
+			// 'English (Canada)' => 'en_CA',
+			// 'English (United Kingdom)' => 'en_GB',
+			'Esperanto'     => 'eo',
+			'Estonian'      => 'et',
+			'Faroese'       => 'fo',
+			'Finnish'       => 'fi',
+			'French'        => 'fr_FR',
+			// 'French (Switzerland)' => 'fr_CH',
+			'Gaelic'        => 'gd',
+			'Gallegan'      => 'gl',
+			'Georgian'      => 'ka_GE',
+			'German'        => 'de',
+			// 'German (Austria)' => 'de_AT',
+			'Greek'         => 'el',
+			'Hebrew'        => 'he_IL',
+			'Hindi'         => 'hi_IN',
+			'Hungarian'     => 'hu_HU',
+			'Icelandic'     => 'is_IS',
+			'Indonesian'    => 'id',
+			'Irish'         => 'ga',
+			'Italian'       => 'it',
+			'Japanese'      => 'ja',
+			// 'Kabyle' => 'kab',
+			'Kazakh'        => 'kk',
+			'Khmer'         => 'km_KH',
+			'Korean'        => 'ko',
+			// 'Korean (Korea)' => 'ko_KR',
+			'Kurdish'       => 'ku',
+			// 'Kurdish (Iraq)' => 'ku_IQ',
+			'Latvian'       => 'lv',
+			'Lithuanian'    => 'lt',
+			'Letzeburgesch' => 'lb',
+			'Macedonian'    => 'mk_MK',
+			'Malayalam'     => 'ml',
+			// 'Malayalam (India)' => 'ml_IN',
+			'Mongolian'     => 'mn_MN',
+			'Norwegian'     => 'nb_NO',
+			'Persian'       => 'fa',
+			// 'Persian (Iran)' => 'fa_IR',
+			'Polish'        => 'pl',
+			// 'Portuguese (Brazil)' => 'pt_BR',
+			'Portuguese'    => 'pt_PT',
+			'Romanian'      => 'ro',
+			'Russian'       => 'ru',
+			// 'Russian (Russia)' => 'ru_RU',
+			'Serbian'       => 'sr',
+			'Sinhala'       => 'si_LK',
+			'Slovak'        => 'sk',
+			'Slovenian'     => 'sl_SI',
+			'Spanish'       => 'es',
+			// 'Spanish (Mexico)' => 'es_MX',
+			'Swedish'       => 'sv_SE',
+			'Tajik'         => 'tg',
+			'Tamil'         => 'ta',
+			// 'Tamil (India)' => 'ta_IN',
+			'Tatar'         => 'tt',
+			'Thai'          => 'th_TH',
+			'Turkish'       => 'tr',
+			// 'Turkish (Turkey)' => 'tr_TR',
+			'Uighur'        => 'ug',
+			'Ukrainian'     => 'uk',
+			// 'Ukrainian (Ukraine)' => 'uk_UA',
+			'Vietnamese'    => 'vi',
+			// 'Vietnamese (Viet Nam)' => 'vi_VN',
+			'Welsh'         => 'cy',
 		);
 
 		if(!isset($tinylang[$lang]))