diff --git a/lang/spanish.inc.php3 b/lang/spanish-iso-8859-1.inc.php3
similarity index 100%
rename from lang/spanish.inc.php3
rename to lang/spanish-iso-8859-1.inc.php3
diff --git a/lang/sync_lang.sh b/lang/sync_lang.sh
index 689c2b577..0979e5591 100755
--- a/lang/sync_lang.sh
+++ b/lang/sync_lang.sh
@@ -46,7 +46,7 @@ romanian-iso-8859-1
 russian-koi8-r
 serbian-windows-1250
 slovak-iso-8859-2
-spanish
+spanish-iso-8859-1
 swedish
 thai
 turkish
diff --git a/libraries/select_lang.lib.php3 b/libraries/select_lang.lib.php3
index 9845cdc1e..db416593b 100644
--- a/libraries/select_lang.lib.php3
+++ b/libraries/select_lang.lib.php3
@@ -81,7 +81,7 @@ $available_languages = array(
     'sk-iso-8859-2'=> array('sk|slovak', 'slovak-iso-8859-2', 'sk'),
     'sk-win1250'   => array('sk|slovak', 'slovak-windows-1250', 'sk'),
     'sq-iso-8859-1'=> array('sq|albanian', 'albanian-iso-8859-1', 'sq'),
-    'sr-win1250'   => array('sr|serbian', 'serbian-win1250', 'sr'),
+    'sr-win1250'   => array('sr|serbian', 'serbian-windows-1250', 'sr'),
     'sv'           => array('sv|swedish', 'swedish', 'sv'),
     'th'           => array('th|thai', 'thai', 'th'),
     'tr'           => array('tr|turkish', 'turkish', 'tr'),