diff --git a/common/framework/compat/langparser.php b/common/framework/compat/langparser.php
index 6f4c299da..582019c81 100644
--- a/common/framework/compat/langparser.php
+++ b/common/framework/compat/langparser.php
@@ -70,7 +70,7 @@ class LangParser
 		unset($xml);
 		
 		// Save the array as a cache file.
-		$buff = "<?php\n";
+		$buff = "<?php\n// $filename\n";
 		foreach ($lang as $key => $value)
 		{
 			if (is_array($value))
diff --git a/common/framework/lang.php b/common/framework/lang.php
index ae6021a1b..ffbaa86cb 100644
--- a/common/framework/lang.php
+++ b/common/framework/lang.php
@@ -102,25 +102,21 @@ class Lang
 		{
 			$filename = $dir . '/' . $this->_language . '.php';
 		}
-		elseif (file_exists($dir . '/' . ($this->_language === 'ja' ? 'jp' : $this->_language) . '.lang.php'))
-		{
-			$filename = $dir . '/' . ($this->_language === 'ja' ? 'jp' : $this->_language) . '.lang.php';
-		}
 		elseif (($hyphen = strpos($this->_language, '-')) !== false)
 		{
 			if (file_exists($dir . '/' . substr($this->_language, 0, $hyphen) . '.php'))
 			{
 				$filename = $dir . '/' . substr($this->_language, 0, $hyphen) . '.php';
 			}
-			elseif (file_exists($dir . '/' . substr($this->_language, 0, $hyphen) . '.lang.php'))
-			{
-				$filename = $dir . '/' . substr($this->_language, 0, $hyphen) . '.lang.php';
-			}
 		}
 		elseif (file_exists("$dir/lang.xml"))
 		{
 			$filename = Compat\LangParser::compileXMLtoPHP("$dir/lang.xml", $this->_language === 'ja' ? 'jp' : $this->_language);
 		}
+		elseif (file_exists($dir . '/' . ($this->_language === 'ja' ? 'jp' : $this->_language) . '.lang.php'))
+		{
+			$filename = $dir . '/' . ($this->_language === 'ja' ? 'jp' : $this->_language) . '.lang.php';
+		}
 		
 		// Load the language file.
 		if ($filename)