Index: xorg-server-1.6.5/hw/vnc/kbdptr.c
===================================================================
--- xorg-server-1.6.5.orig/hw/vnc/kbdptr.c
+++ xorg-server-1.6.5/hw/vnc/kbdptr.c
@@ -166,7 +166,9 @@ KbdAddEvent(Bool down, KeySym keySym, rf
     if (!kbdDevice)
         return;
 
-    keySyms = &kbdDevice->key->curKeySyms;
+    /* Use virtual core keyboard for keysyms - see discussion on
+     * https://defect.opensolaris.org/bz/show_bug.cgi?id=8687 */
+    keySyms = &inputInfo.keyboard->key->curKeySyms;
 
 #ifdef CORBA
     if (cl) {
@@ -277,7 +279,8 @@ KbdAddEvent(Bool down, KeySym keySym, rf
 		shiftMustBePressed = TRUE;
 	}
 
-	SendMappingNotify(kbdDevice, MappingKeyboard, keyCode, 1, serverClient);
+	/* Use virtual core keyboard for keysyms */
+	SendMappingNotify(inputInfo.keyboard, MappingKeyboard, keyCode, 1, serverClient);
 
 	ErrorF("KbdAddEvent: unknown KeySym 0x%x - allocating KeyCode %d\n",
 	       (int)keySym, keyCode);