diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 43355b22aaa..bdf754ec872 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -133,6 +133,8 @@ dll\keyboard\kbdfr\kbdfr.dll                        1
 dll\keyboard\kbdgr\kbdgr.dll                        1
 dll\keyboard\kbdhe\kbdhe.dll                        1
 dll\keyboard\kbdhu\kbdhu.dll                        1
+dll\keyboard\kbdpo\kbdja.dll                        1
+dll\keyboard\kbdpo\kbdpo.dll                        1
 dll\keyboard\kbdru\kbdru.dll                        1
 dll\keyboard\kbdse\kbdse.dll                        1
 dll\keyboard\kbdsg\kbdsg.dll                        1
@@ -140,7 +142,6 @@ dll\keyboard\kbdsk\kbdsk.dll                        1
 dll\keyboard\kbduk\kbduk.dll                        1
 dll\keyboard\kbdur\kbdur.dll                        1
 dll\keyboard\kbdus\kbdus.dll                        1
-dll\keyboard\kbdpo\kbdpo.dll                        1
 
 dll\ntdll\ntdll.dll                                 1
 
diff --git a/reactos/boot/bootdata/txtsetup.sif b/reactos/boot/bootdata/txtsetup.sif
index 385b4bdf371..9525fa55089 100644
--- a/reactos/boot/bootdata/txtsetup.sif
+++ b/reactos/boot/bootdata/txtsetup.sif
@@ -98,16 +98,17 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)"
 00010409 = "English (USA-Dvorak)"
 0000040C = "French (France)"
 00000407 = "German (Germany)"
-0000040E = "Hungarian" 
-00000419 = "Russian"
-0000040A = "Spanish (traditional short)"
-0000041D = "Swedish (Sweden)"
 00000807 = "German (Swiss)"
 00000408 = "Greek"
-00000422 = "Ukrainian"
 00010408 = "Greek 220"
-0000041B = "Slovak (QWERTZ)"
+0000040E = "Hungarian" 
+00000411 = "Japanese"
 00000816 = "Portuguese (Portugal)"
+00000419 = "Russian"
+0000041B = "Slovak (QWERTZ)"
+0000040A = "Spanish (traditional short)"
+0000041D = "Swedish (Sweden)"
+00000422 = "Ukrainian"
 
 [Files.KeyboardLayout]
 00000406 = kbdda.dll
@@ -127,6 +128,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)"
 00010408 = kbdhe.dll
 0000041B = kbdsk.dll
 00000816 = kbdpo.dll
+00000411 = kbdja.dll
 
 [HiveInfs.Install]
 AddReg=hivecls.inf,AddReg