diff --git a/src/client.c b/src/client.c
index f96869a..20d7468 100644
--- a/src/client.c
+++ b/src/client.c
@@ -304,7 +304,7 @@ client_swap(struct client *c, enum position p)
           if(ev.type == KeyPress)
           {
                XKeyPressedEvent *ke = &ev.xkey;
-               keysym = XKeycodeToKeysym(W->dpy, (KeyCode)ke->keycode, 0);
+               keysym = XkbKeycodeToKeysym(W->dpy, (KeyCode)ke->keycode, 0, 0);
 
                _REV_SBORDER();
 
@@ -1368,7 +1368,7 @@ client_fac_resize(struct client *c, enum position p, int fac)
           if(ev.type == KeyPress)
           {
                XKeyPressedEvent *ke = &ev.xkey;
-               keysym = XKeycodeToKeysym(W->dpy, (KeyCode)ke->keycode, 0);
+               keysym = XkbKeycodeToKeysym(W->dpy, (KeyCode)ke->keycode, 0, 0);
 
                _REV_BORDER();
 
diff --git a/src/client.h b/src/client.h
index 0535aae..c896b9c 100644
--- a/src/client.h
+++ b/src/client.h
@@ -6,6 +6,8 @@
 #ifndef CLIENT_H
 #define CLIENT_H
 
+#include <X11/XKBlib.h>
+
 #include "wmfs.h"
 #include "layout.h"
 #include "ewmh.h"