diff --git a/application/config/gettext.php b/application/config/gettext.php
index 279906a37..2d2b37c04 100644
--- a/application/config/gettext.php
+++ b/application/config/gettext.php
@@ -221,6 +221,16 @@ $config['languages'] = array(
 		'code'      => 'it',
 		'flag'      => 'it',
 	),
+	'japanese' => array(
+		'name'      => '日本語',
+		'name_en'   => 'Japanese',
+		'folder'    => 'japanese',
+		'locale'    => 'ja',
+		'gettext'   => 'ja',
+		'direction' => 'ltr',
+		'code'      => 'ja',
+		'flag'      => 'jp',
+	),
 	'latvian' => array(
 		'name'      => 'Latviešu',
 		'name_en'   => 'Latvian',
diff --git a/application/locale/ja/LC_MESSAGES/index.html b/application/locale/ja/LC_MESSAGES/index.html
new file mode 100644
index 000000000..67f2d8864
--- /dev/null
+++ b/application/locale/ja/LC_MESSAGES/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden. </p>
+
+</body>
+</html>
diff --git a/application/views/debug/index.php b/application/views/debug/index.php
index 7160e9761..a2b3ba36b 100644
--- a/application/views/debug/index.php
+++ b/application/views/debug/index.php
@@ -681,6 +681,7 @@
     <?= __("Greek"); ?>
     <?= __("Hungarian"); ?>
     <?= __("Italian"); ?>
+    <?= __("Japanese"); ?>
     <?= __("Latvian"); ?>
     <?= __("Lithuanian"); ?>
     <?= __("Montenegrin"); ?>
diff --git a/install/includes/gettext/gettext_conf.php b/install/includes/gettext/gettext_conf.php
index ce565a1b9..58fad7188 100644
--- a/install/includes/gettext/gettext_conf.php
+++ b/install/includes/gettext/gettext_conf.php
@@ -166,6 +166,16 @@ $gt_conf['languages'] = array(
 		'code'      => 'hu',
 		'flag'      => 'hu',
 	),
+	'japanese' => array(
+		'name'      => '日本語',
+		'name_en'   => 'Japanese',
+		'folder'    => 'japanese',
+		'locale'    => 'ja',
+		'gettext'   => 'ja',
+		'direction' => 'ltr',
+		'code'      => 'ja',
+		'flag'      => 'jp',
+	),
 	'italian' => array(
 		'name'      => 'Italiano',
 		'name_en'   => 'Italian',
diff --git a/install/includes/gettext/locale/ja/LC_MESSAGES/index.html b/install/includes/gettext/locale/ja/LC_MESSAGES/index.html
new file mode 100644
index 000000000..67f2d8864
--- /dev/null
+++ b/install/includes/gettext/locale/ja/LC_MESSAGES/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden. </p>
+
+</body>
+</html>
diff --git a/install/includes/interface_assets/footer.php b/install/includes/interface_assets/footer.php
index 1e0bf7f7e..b3c323b03 100644
--- a/install/includes/interface_assets/footer.php
+++ b/install/includes/interface_assets/footer.php
@@ -70,6 +70,7 @@
 		<?= __("Greek"); ?>
 		<?= __("Hungarian"); ?>
 		<?= __("Italian"); ?>
+		<?= __("Japanese"); ?>
 		<?= __("Latvian"); ?>
 		<?= __("Lithuanian"); ?>
 		<?= __("Montenegrin"); ?>
