Index: xf86-input-keyboard/src/lnx_kbd.c
===================================================================
--- xf86-input-keyboard.orig/src/lnx_kbd.c
+++ xf86-input-keyboard/src/lnx_kbd.c
@@ -254,7 +254,7 @@ KbdInit(InputInfoPtr pInfo, int what)
     if (pKbd->isConsole) {
         ioctl (pInfo->fd, KDGKBMODE, &(priv->kbdtrans));
         tcgetattr (pInfo->fd, &(priv->kbdtty));
-    }
+    };pKbd->CustomKeycodes = TRUE;
     if (!pKbd->CustomKeycodes) {
         pKbd->RemapScanCode = ATScancode;
     }
@@ -269,7 +269,7 @@ KbdOn(InputInfoPtr pInfo, int what)
     LnxKbdPrivPtr priv = (LnxKbdPrivPtr) pKbd->private;
     struct termios nTty;
 
-    if (pKbd->isConsole) {
+    pKbd->CustomKeycodes = TRUE;if (pKbd->isConsole) {
 	if (pKbd->CustomKeycodes)
 	    ioctl(pInfo->fd, KDSKBMODE, K_MEDIUMRAW);
 	else
@@ -503,6 +503,8 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
         fclose(f);
     }
   }
+#else
+    pKbd->CustomKeycodes = TRUE;
 #endif
     return TRUE;
 }