diff --git a/src/autotype/x11/AutoTypeX11.cpp b/src/autotype/x11/AutoTypeX11.cpp
index afa0e1de..96711bce 100644
--- a/src/autotype/x11/AutoTypeX11.cpp
+++ b/src/autotype/x11/AutoTypeX11.cpp
@@ -606,54 +606,56 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym, unsigned int shift)
     int revert_to;
     XKeyEvent event;
     int keycode;
-    int phase, inx;
+    int phase;
     bool found;
+    KeySym ks;
+    unsigned int mods_rtrn = 0;
+    XkbDescPtr kbd = XkbGetKeyboard (m_dpy, XkbCompatMapMask | XkbGeometryMask, XkbUseCoreKbd);
 
     XGetInputFocus(m_dpy, &cur_focus, &revert_to);
 
     found = FALSE;
     keycode = 0;
+
     if (keysym != NoSymbol) {
         for (phase = 0; phase < 2; phase++) {
-            for (keycode = m_minKeycode; !found && (keycode <= m_maxKeycode); keycode++) {
-                /* Determine keycode for the keysym:  we use this instead
-                of XKeysymToKeycode() because we must know shift_state, too */
-                inx = (keycode - m_minKeycode) * m_keysymPerKeycode;
-                if (m_keysymTable[inx] == keysym) {
-                    shift &= ~m_altgrMask;
-                    if (m_keysymTable[inx + 1] != NoSymbol) shift &= ~ShiftMask;
-                    found = TRUE;
-                    break;
-                } else if (m_keysymTable[inx + 1] == keysym) {
-                    shift &= ~m_altgrMask;
-                    shift |= ShiftMask;
-                    found = TRUE;
-                    break;
-                }
-            }
-            if (!found && m_altgrMask && 3 <= m_keysymPerKeycode) {
-                for (keycode = m_minKeycode; !found && (keycode <= m_maxKeycode); keycode++) {
-                    inx = (keycode - m_minKeycode) * m_keysymPerKeycode;
-                    if (m_keysymTable[inx + 2] == keysym) {
-                        shift &= ~ShiftMask;
-                        shift |= m_altgrMask;
-                        found = TRUE;
-                        break;
-                    } else if (4 <= m_keysymPerKeycode && m_keysymTable[inx + 3] == keysym) {
-                        shift |= ShiftMask | m_altgrMask;
-                        found = TRUE;
-                        break;
+            keycode = XKeysymToKeycode(m_dpy, keysym);
+            XkbTranslateKeyCode(kbd, keycode, 0, &mods_rtrn, &ks);
+            if (ks == keysym) {
+                shift &= ~m_altgrMask;
+                found = TRUE;
+            } else {
+
+                XkbTranslateKeyCode(kbd, keycode, ShiftMask, &mods_rtrn, &ks);
+                if (ks == keysym) {
+                     shift &= ~m_altgrMask;
+                     shift |= ShiftMask;
+                     found = TRUE;
+                } else {
+
+                    XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks);
+                    if (ks == keysym) {
+                         shift &= ~ShiftMask;
+                         shift |= m_altgrMask;
+                         found = TRUE;
+                    } else {
+             
+                        XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks);
+                        if (ks == keysym) {
+                             shift |= ShiftMask | m_altgrMask;
+                             found = TRUE;
+                        } 
                     }
                 }
             }
             if (found) break;
 
             if (0xF000 <= keysym) {
-                /* for special keys such as function keys,
-                first try to add it in the non-shifted position of the keymap */
-                if (AddKeysym(keysym, TRUE) == NoSymbol) AddKeysym(keysym, FALSE);
+                    /* for special keys such as function keys,
+                    first try to add it in the non-shifted position of the keymap */
+                    if (AddKeysym(keysym, TRUE) == NoSymbol) AddKeysym(keysym, FALSE);
             } else {
-                AddKeysym(keysym, FALSE);
+                    AddKeysym(keysym, FALSE);
             }
         }
     }
@@ -772,6 +774,7 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym, unsigned int shift)
         SendEvent(&event);
         event.state &= ~ControlMask;
     }
+    XkbFreeKeyboard(kbd, XkbAllComponentsMask, True);
 }
 
 int AutoTypePlatformX11::MyErrorHandler(Display* my_dpy, XErrorEvent* event)
diff --git a/src/autotype/x11/AutoTypeX11.h b/src/autotype/x11/AutoTypeX11.h
index 7e67dc83..370e5504 100644
--- a/src/autotype/x11/AutoTypeX11.h
+++ b/src/autotype/x11/AutoTypeX11.h
@@ -26,6 +26,7 @@
 #include <QX11Info>
 
 #include <X11/Xutil.h>
+#include <X11/XKBlib.h>
 #include <X11/extensions/XTest.h>
 
 #include "autotype/AutoTypePlatformPlugin.h"