xkeyboard-config + patches from OpenBSD