diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index d5aa320653..c2a6b1b4b6 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -231,6 +231,7 @@ const KeyMap_IntStrPair key_names[] = {
 	{KEYCODE_APOSTROPHE, "'"},
 	{KEYCODE_MINUS, "-"},
 	{KEYCODE_PLUS, "+"},
+	{KEYCODE_SCROLL_LOCK, "ScrLock"},
 
 	{KEYCODE_BACK, "Back"},
 	{KEYCODE_TAB, "Tab"},
@@ -247,10 +248,14 @@ const KeyMap_IntStrPair key_names[] = {
 	{KEYCODE_MOVE_HOME, "Home"},
 	{KEYCODE_MOVE_END, "End"},
 	{KEYCODE_ESCAPE, "Esc"},
+	{KEYCODE_CAPS_LOCK, "CapsLock"},
 
 	{KEYCODE_VOLUME_UP, "Vol +"},
 	{KEYCODE_VOLUME_DOWN, "Vol -"},
 	{KEYCODE_HOME, "Home"},
+	{KEYCODE_INSERT, "Ins"},
+	{KEYCODE_PAGE_UP, "PgUp"},
+	{KEYCODE_PAGE_DOWN, "PgDn"},
 	{KEYCODE_CALL, "Call"},
 	{KEYCODE_ENDCALL, "End Call"},
 
@@ -297,10 +302,32 @@ const KeyMap_IntStrPair key_names[] = {
 	{KEYCODE_BUTTON_THUMBL, "ThumbL"},
 	{KEYCODE_BUTTON_THUMBR, "ThumbR"},
 	{KEYCODE_BUTTON_MODE, "Mode"},
+
+	{KEYCODE_EXT_PIPE, "|"},
+	{KEYCODE_NUMPAD_DIVIDE, "Num/"},
+	{KEYCODE_NUMPAD_MULTIPLY, "Num*"},
+	{KEYCODE_NUMPAD_ADD, "Num+"},
+	{KEYCODE_NUMPAD_SUBTRACT, "Num-"},
+	{KEYCODE_NUMPAD_DOT, "Num."},
+	{KEYCODE_NUMPAD_COMMA, "Num,"},
+	{KEYCODE_NUMPAD_ENTER, "NumEnter"},
+	{KEYCODE_NUMPAD_EQUALS, "Num="},
+	{KEYCODE_NUMPAD_LEFT_PAREN, "Num("},
+	{KEYCODE_NUMPAD_RIGHT_PAREN, "Num)"},
+	{KEYCODE_NUMPAD_0, "Num0"},
+	{KEYCODE_NUMPAD_1, "Num1"},
+	{KEYCODE_NUMPAD_2, "Num2"},
+	{KEYCODE_NUMPAD_3, "Num3"},
+	{KEYCODE_NUMPAD_4, "Num4"},
+	{KEYCODE_NUMPAD_5, "Num5"},
+	{KEYCODE_NUMPAD_6, "Num6"},
+	{KEYCODE_NUMPAD_7, "Num7"},
+	{KEYCODE_NUMPAD_8, "Num8"},
+	{KEYCODE_NUMPAD_9, "Num9"},
 };
 
 static int key_names_count = sizeof(key_names) / sizeof(key_names[0]);
-static std::string unknown_key_name = "N/A";
+static std::string unknown_key_name = "??";
 const KeyMap_IntStrPair psp_button_names[] = {
 	{CTRL_CIRCLE, "O"},
 	{CTRL_CROSS, "X"},
diff --git a/Windows/KeyboardDevice.cpp b/Windows/KeyboardDevice.cpp
index d42a836626..d4d53c89eb 100644
--- a/Windows/KeyboardDevice.cpp
+++ b/Windows/KeyboardDevice.cpp
@@ -62,6 +62,7 @@ std::map<int, int> windowsTransTable = InitConstMap<int, int>
 	(VK_NUMPAD7, KEYCODE_NUMPAD_7)
 	(VK_NUMPAD8, KEYCODE_NUMPAD_8)
 	(VK_NUMPAD9, KEYCODE_NUMPAD_9)
+	(VK_DECIMAL, KEYCODE_NUMPAD_DOT)
 	(VK_DIVIDE, KEYCODE_NUMPAD_DIVIDE)
 	(VK_MULTIPLY, KEYCODE_NUMPAD_MULTIPLY)
 	(VK_SUBTRACT, KEYCODE_NUMPAD_SUBTRACT)
@@ -97,6 +98,7 @@ std::map<int, int> windowsTransTable = InitConstMap<int, int>
 	(VK_OEM_2, KEYCODE_SLASH)
 	(VK_OEM_3, KEYCODE_GRAVE)
 	(VK_OEM_4, KEYCODE_LEFT_BRACKET)
+	(VK_OEM_5, KEYCODE_BACKSLASH)
 	(VK_OEM_6, KEYCODE_RIGHT_BRACKET)
 	(VK_OEM_7, KEYCODE_APOSTROPHE)
 	(VK_MENU, KEYCODE_MENU)
@@ -106,7 +108,8 @@ std::map<int, int> windowsTransTable = InitConstMap<int, int>
 	(VK_RCONTROL, KEYCODE_CTRL_RIGHT)
 	(VK_LMENU, KEYCODE_ALT_LEFT)
 	(VK_RMENU, KEYCODE_ALT_RIGHT)
-	(VK_RETURN, KEYCODE_ENTER);
+	(VK_RETURN, KEYCODE_ENTER)
+	(VK_OEM_102, KEYCODE_EXT_PIPE);
 
 int KeyboardDevice::UpdateState(InputState &input_state) {
 	// Nothing to do, all done in WM_INPUT
diff --git a/native b/native
index 127d9d3854..839222a4fa 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 127d9d38544ddb02ada012796f1b273f05720666
+Subproject commit 839222a4fa2b5d7d5f9b69ee87085d7cda0d4e89