diff --git a/gen_method_xml.py b/gen_method_xml.py
index cc0522837..ed235ab64 100644
--- a/gen_method_xml.py
+++ b/gen_method_xml.py
@@ -47,6 +47,7 @@ def loc(loc_name, script, default_layout, **kwargs):
   loc("ig_NG", "latin", "latn_qwerty_us", extra_keys="₦|ṅ|ọ|ụ"),
   loc("is_IS", "latin", "latn_qwerty_is", extra_keys="ð|þ|æ|accent_trema:ö@o|accent_aigu:á:é:í:ó:ú:ý@d|accent_circonflexe|accent_ring|accent_grave"),
   loc("it_IT", "latin", "latn_qwerty_us", extra_keys="accent_grave:à:è:ì:ò:ù@f|accent_aigu:é:ó@d|accent_circonflexe:î@f|€|ə"),
+  loc("ja_JP", "latin", "latn_jis_jp"),
   loc("ka_GE", "latin", "georgian_mes"),
   loc("kk_KZ", "latin", "cyrl_jcuken_kk"),
   loc("kn_IN", "kannada", "kann_kannada"),
diff --git a/res/values/layouts.xml b/res/values/layouts.xml
index 11ac6375e..ca2c30c81 100644
--- a/res/values/layouts.xml
+++ b/res/values/layouts.xml
@@ -47,6 +47,7 @@
     <item>latn_azerty_fr</item>
     <item>latn_bepo_fr</item>
     <item>latn_bone</item>
+    <item>latn_jis_jp</item>
     <item>latn_neo2</item>
     <item>latn_qwerty_apl</item>
     <item>latn_qwerty_az</item>
@@ -141,6 +142,7 @@
     <item>AZERTY (Français)</item>
     <item>BEPO (Français)</item>
     <item>Bone</item>
+    <item>JIS (Japan)</item>
     <item>Neo 2</item>
     <item>QWERTY (APL)</item>
     <item>QWERTY (Azərbaycanca)</item>
@@ -235,6 +237,7 @@
     <item>@xml/latn_azerty_fr</item>
     <item>@xml/latn_bepo_fr</item>
     <item>@xml/latn_bone</item>
+    <item>@xml/latn_jis_jp</item>
     <item>@xml/latn_neo2</item>
     <item>@xml/latn_qwerty_apl</item>
     <item>@xml/latn_qwerty_az</item>
diff --git a/res/xml/method.xml b/res/xml/method.xml
index 1b6b01e7e..1e84c8430 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -42,6 +42,7 @@
   <subtype android:label="%s" android:languageTag="ig" android:imeSubtypeLocale="ig_NG" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=₦|ṅ|ọ|ụ" />
   <subtype android:label="%s" android:languageTag="is" android:imeSubtypeLocale="is_IS" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_is,extra_keys=ð|þ|æ|accent_trema:ö@o|accent_aigu:á:é:í:ó:ú:ý@d|accent_circonflexe|accent_ring|accent_grave" />
   <subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,dictionary=it,extra_keys=accent_grave:à:è:ì:ò:ù@f|accent_aigu:é:ó@d|accent_circonflexe:î@f|€|ə" />
+  <subtype android:label="%s" android:languageTag="ja" android:imeSubtypeLocale="ja_JP" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_jis_jp" />
   <subtype android:label="%s" android:languageTag="ka" android:imeSubtypeLocale="ka_GE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=georgian_mes,dictionary=ka" />
   <subtype android:label="%s" android:languageTag="kk" android:imeSubtypeLocale="kk_KZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=cyrl_jcuken_kk" />
   <subtype android:label="%s" android:languageTag="kn" android:imeSubtypeLocale="kn_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=kannada,default_layout=kann_kannada,dictionary=kn" />
diff --git a/srcs/layouts/latn_jis_jp.xml b/srcs/layouts/latn_jis_jp.xml
new file mode 100644
index 000000000..9a5e5691c
--- /dev/null
+++ b/srcs/layouts/latn_jis_jp.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<keyboard name="JIS (Japan)" script="latin">
+  <row>
+    <key key0="q" key2="1" key4="!" key1="loc esc"/>
+    <key key0="w" key2="2" key3="&quot;"/>
+    <key key0="e" key2="3" key3="\#" key4="loc €"/>
+    <key key0="r" key2="4" key3="$"/>
+    <key key0="t" key2="5" key3="%"/>
+    <key key0="y" key2="6" key3="&amp;"/>
+    <key key0="u" key2="7" key3="'"/>
+    <key key0="i" key2="8" key3="(" key4=")"/>
+    <key key0="o" key1="=" key2="9" key3="-" key4="accent_macron"/>
+    <key key0="p" key1="~" key2="0" key3="^"/>
+  </row>
+  <row>
+    <key shift="0.5" key0="a" key1="loc tab"/>
+    <key key0="s" key2="loc §" key3="loc ß"/>
+    <key key0="d"/>
+    <key key0="f"/>
+    <key key0="g" key2="+" key3=";"/>
+    <key key0="h" key2="*" key3=":"/>
+    <key key0="j" key3="{" key4="}"/>
+    <key key0="k" key3="[" key4="]"/>
+    <key key0="l" key2="|" key3="¥"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift" key2="loc capslock"/>
+    <key key0="z"/>
+    <key key0="x" key2="loc †"/>
+    <key key0="c" key2="&lt;" key3=","/>
+    <key key0="v" key2=">" key3="."/>
+    <key key0="b" key2="\?" key3="/"/>
+    <key key0="n" key2="_" key3="\\"/>
+    <key key0="m" key2="`" key3="\@"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>