diff --git a/l10n/fedora-livecd-cinnamon-ja_JP.ks b/l10n/fedora-livecd-cinnamon-ja_JP.ks
new file mode 100644
index 0000000..e1ca1bf
--- /dev/null
+++ b/l10n/fedora-livecd-cinnamon-ja_JP.ks
@@ -0,0 +1,35 @@
+# fedora-livecd-cinnamon-ja_JP.ks
+#
+# Description:
+# - Japanese Fedora Live Spin with the Cinnamon Desktop Environment
+#
+# Maintainer(s):
+# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
+
+%include ../fedora-live-cinnamon.ks
+
+lang ja_JP.UTF-8
+keyboard jp
+timezone Asia/Tokyo
+
+%packages
+@japanese-support
+# exclude input methods except ibus:
+-m17n*
+-scim*
+-iok
+%end
+
+%post
+cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
+# Read and parsed by systemd-localed. It's probably wise not to edit this file
+# manually too freely.
+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        Option "XkbLayout" "jp"
+        Option "XkbModel" "jp106"
+EndSection
+EOF
+%end
+
diff --git a/l10n/fedora-livecd-xfce-ja_JP.ks b/l10n/fedora-livecd-xfce-ja_JP.ks
index 39e44b3..35ceea1 100644
--- a/l10n/fedora-livecd-xfce-ja_JP.ks
+++ b/l10n/fedora-livecd-xfce-ja_JP.ks
@@ -14,11 +14,13 @@ timezone Asia/Tokyo
 
 %packages
 @japanese-support
-# exclude input methods:
+# exclude input methods except ibus:
 -m17n*
 -scim*
--ibus*
 -iok
+
+# ibus-kkc 
+ibus-kkc
 %end
 
 %post