diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 53d7a365ac..f75a9ad941 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -621,8 +621,9 @@ function language_select($default, $select_name = "language", $dirname="language
 	{
 		if ( ereg("^lang_", $file) && !is_file($dirname . "/" . $file) && !is_link($dirname . "/" . $file) )
 		{
-			$filename = str_replace("lang_", "", $file);
-			$displayname = preg_replace("/(.*)_(.*)/", "\\1 [ \\2 ]", $filename);
+			$filename = trim(str_replace("lang_", "", $file));
+			$displayname = preg_replace("/^(.*?)_(.*)$/", "\\1 [ \\2 ]", $filename);
+			$displayname = preg_replace("/\[(.*?)_(.*)\]/", "[ \\1 - \\2 ]", $displayname);
 			$lang[$displayname] = $filename;
 		}
 	}