diff --git a/src/xcore_event.c b/src/xcore_event.c
index ba6fa6d..636d030 100644
--- a/src/xcore_event.c
+++ b/src/xcore_event.c
@@ -31,6 +31,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/XKBlib.h>
 
 #include "portab.h"
 #include "system.h"
@@ -132,7 +133,7 @@ static boolean xcore_getEvent(void) {
 			KeySym sym;
 			
 			keyEventProsess((XKeyEvent *)&e);
-			sym = XKeycodeToKeysym(x11_display, e.xkey.keycode, 0);
+			sym = XkbKeycodeToKeysym(x11_display, e.xkey.keycode, 0, 0);
 			if (sym == XK_F4) {
 				Xcore_fullScreen(!x11_fs_on);
 			} else if (sym == XK_F1) {
diff --git a/src/xcore_input.c b/src/xcore_input.c
index baf5fca..0d63483 100644
--- a/src/xcore_input.c
+++ b/src/xcore_input.c
@@ -98,7 +98,7 @@ static void buttonEventProcess(XButtonEvent *e) {
 }
 
 static int convertKeyCode(unsigned int keycode) {
-	KeySym sym = XKeycodeToKeysym(x11_display, keycode, 0);
+	KeySym sym = XkbKeycodeToKeysym(x11_display, keycode, 0, 0);
 	switch(sym) {
 	case XK_BackSpace:
 		return KEY_BS;