--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-input-keyboard/7005752.patch	Tue Dec 14 00:55:39 2010 -0800
@@ -0,0 +1,57 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+--- src/sun_kbdMap.c.orig	Thu Aug 26 03:28:10 2010
++++ src/sun_kbdMap.c	Fri Dec 10 02:32:43 2010
+@@ -36,10 +36,6 @@
+ 
+ /* Map the Solaris keycodes to the "XFree86" keycodes. */
+ 
+-/* Additional Sun Japanese Keyboard Keys not defined in atKeynames.h */
+-#define KEY_Kanji	0x82
+-#define KEY_Execute	0x83
+-
+ /* 
+  * Additional Korean 106 Keyboard Keys not defined in atKeynames.h
+  * These are exactly same USB usage id with Kana(0x90) and Eisu(0x91) keys 
+@@ -478,10 +474,10 @@
+ 	/* 133 */ KEY_NOTUSED,
+ 	/* 134 */ KEY_NOTUSED,
+ 	/* 135 */ KEY_BSlash2,	/* Sun Japanese Kbd: Backslash / Underscore */
+-	/* 136 */ KEY_XFER,	/* Sun Japanese Kbd: Henkan Mode */
++	/* 136 */ KEY_HKTG,	/* Sun Japanese type7 Kbd: Hirugana/Katakana */
+ 	/* 137 */ KEY_Yen,	/* Sun Japanese Kbd: Yen / Brokenbar */
+-	/* 138 */ KEY_Kanji,	/* Sun Japanese Kbd: Kanji */
+-	/* 139 */ KEY_Execute,	/* Sun Japanese Kbd: Execute */
++	/* 138 */ KEY_XFER,	/* Sun Japanese Kbd: Kanji Transfer */
++	/* 139 */ KEY_NFER,	/* Sun Japanese Kbd: No Kanji Transfer */
+ 	/* 140 */ KEY_NOTUSED,
+ 	/* 141 */ KEY_NOTUSED,
+ 	/* 142 */ KEY_NOTUSED,
+@@ -603,8 +599,6 @@
+      * Add Sun keyboard keysyms to default map
+      */
+ #define map_for_key(k,c) 	map[(k * GLYPHS_PER_KEY) + c]   
+-    map_for_key(KEY_Kanji,	0) = XK_Kanji;
+-    map_for_key(KEY_Execute,	0) = XK_Execute;
+     map_for_key(KEY_Power,	0) = SunXK_PowerSwitch;
+     map_for_key(KEY_Power,	1) = SunXK_PowerSwitchShift;
+     map_for_key(KEY_Mute,	0) = SunXK_AudioMute;

--- a/open-src/driver/xf86-input-keyboard/Makefile	Mon Dec 13 14:18:45 2010 -0800
+++ b/open-src/driver/xf86-input-keyboard/Makefile	Tue Dec 14 00:55:39 2010 -0800
@@ -38,7 +38,8 @@
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
 	6886424.patch \
-	6897086.patch
+	6897086.patch \
+	7005752.patch
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man