diff --git a/winpr/libwinpr/input/keycode.c b/winpr/libwinpr/input/keycode.c
index 1c628b2ff..beec51980 100644
--- a/winpr/libwinpr/input/keycode.c
+++ b/winpr/libwinpr/input/keycode.c
@@ -401,6 +401,20 @@ DWORD KEYCODE_TO_VKCODE_EVDEV[256] =
 	VK_OEM_102, /* <LSGT> 94 */
 	VK_F11, /* <FK11> 95 */
 	VK_F12, /* <FK12> 96 */
+#ifdef __sun
+	VK_HOME | KBDEXT, /* <HOME> 97 */
+	VK_UP | KBDEXT, /* <UP> 98 */
+	VK_PRIOR | KBDEXT, /* <PGUP> 99 */
+	VK_LEFT | KBDEXT, /* <LEFT> 100 */
+	VK_HKTG, /* <HKTG> 101 */
+	VK_RIGHT | KBDEXT, /* <RGHT> 102 */
+	VK_END | KBDEXT, /* <END> 103 */
+	VK_DOWN | KBDEXT, /* <DOWN> 104 */
+	VK_NEXT | KBDEXT, /* <PGDN> 105 */
+	VK_INSERT | KBDEXT, /* <INS> 106 */
+	VK_DELETE | KBDEXT, /* <DELE> 107 */
+	VK_RETURN | KBDEXT, /* <KPEN> 108 */
+#else
 	VK_ABNT_C1, /* <AB11> 97 */
 	VK_DBE_KATAKANA, /* <KATA> 98 */
 	VK_DBE_HIRAGANA, /* <HIRA> 99 */
@@ -413,6 +427,7 @@ DWORD KEYCODE_TO_VKCODE_EVDEV[256] =
 	VK_DIVIDE | KBDEXT, /* <KPDV> 106 */
 	VK_SNAPSHOT | KBDEXT, /* <PRSC> 107 */
 	VK_RMENU | KBDEXT, /* <RALT> <ALGR> 108 */
+#endif
 	0, /* <LNFD> KEY_LINEFEED 109 */
 	VK_HOME | KBDEXT, /* <HOME> 110 */
 	VK_UP | KBDEXT, /* <UP> 111 */