diff --git a/AUTHORS b/AUTHORS
index c587f67c..b07c00fa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,6 +17,6 @@ hi: Tavish Naruka <tavishnaruka@gmail.com> (हिन्दी)
 ja: Dong <iwadon@yarhalla.jpn.org> (日本語)
 nl: Jaap Blom <jaap.blom@gmail.com> (Nederlands)
 ro: Christian Tzurcanu <christian.tzurcanu@gmail.com> (Româneşte)
-ru: Laurent Dufloux <laurent.dufloux@etu.upmc.fr> (Русский язык)
+ru: Laurent Dufloux <laurent.dufloux@etu.upmc.fr> (Русский)
 sk: Pavol Rusnak <rusnakp@gmail.com> (Slovenčina)
 zh-TW: 黃瀚生(han sheng Huang) <zenixls2@gmail.com> (台灣正體)
diff --git a/editor/locale/locale.js b/editor/locale/locale.js
index 975f739e..a5297ec5 100644
--- a/editor/locale/locale.js
+++ b/editor/locale/locale.js
@@ -9,7 +9,7 @@
 var put_locale = function(svgCanvas, given_param){
 	var lang_param;
 	// TODO: Make this array be based on entries in svg-editor.html
-	var good_langs = ['ar','cs','de','en','es','fa','fr','fy','hi','nl','ro','ru','sk','zh-TW'];
+	var good_langs = ['ar','cs','de','en','es','fa','fr','fy','hi','ja','nl','ro','ru','sk','zh-TW'];
 	if(given_param) {
 		lang_param = given_param;
 	} else {
diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index d2878cb3..debb1077 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -525,6 +525,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 					<option id="lang_fr" value="fr">Français</option>
 					<option id="lang_fy" value="fy">Frysk</option>
 					<option id="lang_hi" value="hi">&#2361;&#2367;&#2344;&#2381;&#2342;&#2368;, &#2361;&#2367;&#2306;&#2342;&#2368;</option>
+					<option id="lang_ja" value="ja">日本語</option>
 					<option id="lang_nl" value="nl">Nederlands</option>
 					<option id="lang_ro" value="ro">Româneşte</option>
 					<option id="lang_ru" value="ru">Русский</option>