diff --git a/lang/croatian-iso8859-2.inc.php3 b/lang/croatian-iso-8859-2.inc.php3
similarity index 100%
rename from lang/croatian-iso8859-2.inc.php3
rename to lang/croatian-iso-8859-2.inc.php3
diff --git a/lang/estonian.inc.php3 b/lang/estonian-iso-8859-1.inc.php3
similarity index 100%
rename from lang/estonian.inc.php3
rename to lang/estonian-iso-8859-1.inc.php3
diff --git a/lang/sync_lang.sh b/lang/sync_lang.sh
index e58aa0cd0..0ae67ce41 100755
--- a/lang/sync_lang.sh
+++ b/lang/sync_lang.sh
@@ -25,7 +25,7 @@ czech-iso-8859-2
 danish-iso-8859-1
 dutch-iso-8859-1
 english-iso-8859-1
-estonian
+estonian-iso-8859-1
 finnish
 french
 galician
diff --git a/libraries/select_lang.lib.php3 b/libraries/select_lang.lib.php3
index 083af4a5c..3650f97f3 100644
--- a/libraries/select_lang.lib.php3
+++ b/libraries/select_lang.lib.php3
@@ -51,7 +51,7 @@ $available_languages = array(
     'de'           => array('de([-_][[:alpha:]]{2})?|german', 'german', 'de'),
     'de-utf-8'     => array('de([-_][[:alpha:]]{2})?|german', 'german-utf-8', 'de'),
     'el'           => array('el|greek',  'greek', 'el'),
-    'en'           => array('en([-_][[:alpha:]]{2})?|english',  'english', 'en'),
+    'en-iso-8859-1'=> array('en([-_][[:alpha:]]{2})?|english',  'english-iso-8859-1', 'en'),
     'en-utf-8'     => array('en([-_][[:alpha:]]{2})?|english',  'english-utf-8', 'en'),
     'es'           => array('es([-_][[:alpha:]]{2})?|spanish', 'spanish', 'es'),
     'et'           => array('et|estonian', 'estonian', 'et'),