diff --git a/20-keyboard.conf b/20-keyboard.conf
index b34b743..9d8302f 100644
--- a/20-keyboard.conf
+++ b/20-keyboard.conf
@@ -4,6 +4,6 @@ Section "InputClass"
     Identifier             "Keyboard Defaults"
     MatchIsKeyboard        "yes"
 #    Option                 "XkbModel" "acer_laptop"
-#    Option                 "XkbLayout" "jp"
+    Option                 "XkbLayout" "jp"
     Option                 "XkbOptions" "ctrl:nocaps,ctrl:menu_rctrl"
 EndSection
diff --git a/xinitrc b/xinitrc
index edbd4d8..68f3893 100644
--- a/xinitrc
+++ b/xinitrc
@@ -2,6 +2,7 @@ test -n "$DISPLAY" || return
 test -z "$ROXTERM_PID" || return
 test -z "$SSH_CONNECTION" || return
 
+setxkbmap -layout "jp"
 test "`hostname`" == "arch-aspireone" &&
 setxkbmap -model "acer_laptop" -layout "jp" # this line must comes first