--- a/src/xorg/keytables/sun-src/symbols/pc	Mon Oct 19 13:40:10 2009 +0200
+++ b/src/xorg/keytables/sun-src/symbols/pc	Tue Oct 20 12:54:58 2009 +0200
@@ -56,8 +56,8 @@
     key <ALT>  {	[ NoSymbol, Alt_L	]	};
     include "altwin(meta_alt)"
 
-    key <META> {	[ NoSymbol, Meta_L	]	};
-    modifier_map Mod1   { <META> };
+//    key <META> {	[ NoSymbol, Meta_L	]	};
+//    modifier_map Mod1   { <META> };
 
     key <SUPR> {	[ NoSymbol, Super_L	]	};
     modifier_map Mod4   { <SUPR> };
@@ -65,10 +65,11 @@
     key <HYPR> {	[ NoSymbol, Hyper_L	]	};
     modifier_map Mod4   { <HYPR> };
 
-    key <OUTP> { [ XF86Display ] };
-    key <KITG> { [ XF86KbdLightOnOff ] };
-    key <KIDN> { [ XF86KbdBrightnessDown ] };
-    key <KIUP> { [ XF86KbdBrightnessUp ] };
+// The following create some duplicate keycodes 
+//    key <OUTP> { [ XF86Display ] };
+//    key <KITG> { [ XF86KbdLightOnOff ] };
+//    key <KIDN> { [ XF86KbdBrightnessDown ] };
+//    key <KIUP> { [ XF86KbdBrightnessUp ] };
 };
 
 partial hidden alphanumeric_keys

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/us	Mon Oct 19 13:40:10 2009 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/us	Tue Oct 20 12:54:58 2009 +0200
@@ -120,10 +120,11 @@
     modifier_map Mod5   { <LVL3>, <MDSW> };
 
     key <ALT>  { [ NoSymbol, Alt_L       ]                     };
-    include "altwin(meta_win)"
-
-    key <META> { [ NoSymbol, Meta_L      ]                     };
-    modifier_map Mod1   { <META> };
+    key <LALT> {        [       Alt_L,  Alt_L           ]       };
+    key <LWIN> {        [       Meta_L                  ]       };
+    key <RWIN> {        [       Meta_R                  ]       };
+    modifier_map Mod1   { Alt_L };
+    modifier_map Mod4   { Meta_L, Meta_R };
 
 //    key <LALT> { [ Alt_L		]			};
 //    key <ALGR> { [ Mode_switch	]			};