diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index acc6040ef..0ba75a3bb 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -244,8 +244,8 @@ function PMA_langDetails($lang) {
             return array('id|indonesian', 'indonesian-utf-8', 'id', 'Bahasa Indonesia');
         case 'it':
             return array('it|italian', 'italian-utf-8', 'it', 'Italiano');
-        case 'jp':
-            return array('jp|japanese', 'japanese-utf-8', 'jp', '日本語');
+        case 'ja':
+            return array('ja|japanese', 'japanese-utf-8', 'ja', '日本語');
         case 'ko':
             return array('ko|korean', 'korean-utf-8', 'ko', '한국어');
         case 'ka':
diff --git a/po/jp.po b/po/ja.po
similarity index 100%
rename from po/jp.po
rename to po/ja.po
diff --git a/scripts/php2gettext.sh b/scripts/php2gettext.sh
index 4363f5594..c0e0d2abf 100755
--- a/scripts/php2gettext.sh
+++ b/scripts/php2gettext.sh
@@ -56,7 +56,7 @@ for lang in lang/*.inc.php ; do
         hungarian) langcode='hu';;
         indonesian) langcode='id';;
         italian) langcode='it';;
-        japanese) langcode='jp';;
+        japanese) langcode='ja';;
         korean) langcode='ko';;
         georgian) langcode='ka';;
         lithuanian) langcode='lt';;