There were a couple of xorg-server-1.2 keyboard patches (at_scancode.c and bsd_kbd.c) that might need to be applied in some form to xf86-input-keyboard-1.2.2. Anybody remember what these were for?