diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 3e90a96c1c..8fff90d045 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -16382,7 +16382,7 @@
     *: ""
   </dest>
   <voice>
-    *: "イングリッシュ"
+    *: "日本語"
   </voice>
 </phrase>
 <phrase>
diff --git a/tools/builds.pm b/tools/builds.pm
index a912576720..b02af6f58d 100644
--- a/tools/builds.pm
+++ b/tools/builds.pm
@@ -615,7 +615,7 @@ sub simbuilds {
 	'lang' => 'bulgarian',
 	'name' => 'Български (Bulgarian)',
         'short' => 'bg',
-        'defengine' => 'espeak',  # XXX Switch to gtts when buildserver is updated
+        'defengine' => 'gtts',
 	'engines' => {
 	    'espeak' => '-vbg',
 	    'gtts' => '-l bg',
@@ -757,7 +757,18 @@ sub simbuilds {
 	},
         'enabled' => 1,
     },
-    'korean' => {  #
+    'japanese' => {
+	'lang' => 'japanese',
+	'name' => '日本語 (Japanese)',
+        'short' => 'ja',
+        'defengine' => 'gtts',
+	'engines' => {
+	    'espeak' => '-vja',
+	    'gtts' => '-l ja',
+	},
+        'enabled' => 1,
+    },
+    'korean' => {
 	'lang' => 'korean',
 	'name' => '한국어 (Korean)',
         'short' => 'ko',
diff --git a/tools/voice.pl b/tools/voice.pl
index 3e3f4d85b7..a0adc55e71 100755
--- a/tools/voice.pl
+++ b/tools/voice.pl
@@ -101,6 +101,7 @@ my %gtts_lang_map = (
     'francais' => '-l fr',
     'greek' => '-l el',
     'italiano' => '-l it',
+    'japanese' => '-l ja',
     'korean' => '-l ko',
     'magyar' => '-l hu',
     'nederlands' => '-l nl',