diff --git a/src/i18n/index.jsx b/src/i18n/index.jsx
index 929ff4b..1876a0f 100644
--- a/src/i18n/index.jsx
+++ b/src/i18n/index.jsx
@@ -12,6 +12,7 @@ import messages_fr from './messages_fr.json';
 import messages_gl from './messages_gl.json';
 import messages_hi from './messages_hi.json';
 import messages_it from './messages_it.json';
+import messages_ja from './messages_ja.json';
 import messages_ko from './messages_ko.json';
 import messages_nl from './messages_nl.json';
 import messages_pt from './messages_pt.json';
@@ -34,6 +35,7 @@ const MESSAGES = {
   gl: messages_gl,
   hi: messages_hi,
   it: messages_it,
+  ja: messages_ja,
   ko: messages_ko,
   nl: messages_nl,
   pt: messages_pt,
@@ -55,7 +57,7 @@ i18n.init = (lang, opt_messages) => {
 
   if (lang) {
     i18n.locale(lang);
-    i18n.extend(MESSAGES[lang]);  
+    i18n.extend(MESSAGES[lang]);
   }
 
   if (opt_messages)
@@ -73,6 +75,7 @@ import fr from 'timeago.js/lib/lang/fr';
 import gl from 'timeago.js/lib/lang/gl';
 import hi from 'timeago.js/lib/lang/hi_IN';
 import it from 'timeago.js/lib/lang/it';
+import ja from 'timeago.js/lib/lang/ja';
 import ko from 'timeago.js/lib/lang/ko';
 import nl from 'timeago.js/lib/lang/nl';
 import pt from 'timeago.js/lib/lang/pt_BR';
@@ -80,9 +83,9 @@ import ru from 'timeago.js/lib/lang/ru';
 import sv from 'timeago.js/lib/lang/sv';
 import th from 'timeago.js/lib/lang/th';
 import tr from 'timeago.js/lib/lang/tr';
+// import ur from 'timeago.js/lib/lang/ur'; // Not currently supported by TimeAgo
 import zh_CN from 'timeago.js/lib/lang/zh_CN';
 import zh_TW from 'timeago.js/lib/lang/zh_TW';
-// import ur from 'timeago.js/lib/lang/ur'; // Not currently supported by TimeAgo
 
 timeago.register('ar', ar);
 timeago.register('cs', cs);
@@ -94,6 +97,7 @@ timeago.register('fr', fr);
 timeago.register('gl', gl);
 timeago.register('hi', hi);
 timeago.register('it', it);
+timeago.register('ja', ja);
 timeago.register('ko', ko);
 timeago.register('nl', nl);
 timeago.register('pt', pt);
@@ -117,16 +121,16 @@ i18n.registerMessages = (lang, messages) => {
 
 export default i18n;
 
-/** 
- * For convenience: exposes a pre-localized TimeAgo widget, 
+/**
+ * For convenience: exposes a pre-localized TimeAgo widget,
  * for use in plugins
  */
 export const LocalTimeAgo = props => {
 
   return (
-    <TimeAgo 
+    <TimeAgo
       datetime={props.timestamp}
       locale={i18n.locale()} />
   )
 
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages_ja.json b/src/i18n/messages_ja.json
new file mode 100644
index 0000000..c9efe18
--- /dev/null
+++ b/src/i18n/messages_ja.json
@@ -0,0 +1,10 @@
+{
+  "Add a comment...": "コメントを追加する...",
+  "Add a reply...": "返信する...",
+  "Add tag...": "タグを追加する...",
+  "Cancel": "キャンセル",
+  "Close": "閉じる",
+  "Edit": "編集",
+  "Delete": "削除",
+  "Ok": "Ok"
+}