#
# Updated but not checked in:
#   (will commit)
#
#	modified: src/evdev.c
#	modified: src/evdev_key.c
#
diff --git a/src/evdev.c b/src/evdev.c
index 1b7fb86..451acd9 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -109,7 +109,7 @@ EvdevReadInput(InputInfoPtr pInfo)
             break;
 
         case EV_KEY:
-	    if ((ev.code >= BTN_MISC) && (ev.code < KEY_OK))
+	    if ((ev.code >= BTN_MOUSE) && (ev.code < BTN_JOYSTICK ))
 		EvdevBtnProcess (pInfo, &ev);
 	    else
 		EvdevKeyProcess (pInfo, &ev);
diff --git a/src/evdev_key.c b/src/evdev_key.c
index 8917c3b..55c5215 100644
--- a/src/evdev_key.c
+++ b/src/evdev_key.c
@@ -447,5 +447,9 @@ EvdevKeyProcess (InputInfoPtr pInfo, str
 	    return;
     }
 
+    if (keycode > 256) {
+        keycode =  256 - (keycode % 256);
+    }
+
     xf86PostKeyboardEvent(pInfo->dev, keycode, ev->value);
 }