Index: keycodes/xfree86
===================================================================
--- keycodes/xfree86.orig
+++ keycodes/xfree86
@@ -302,6 +302,9 @@ xkb_keycodes "basic" {
     // MacBooks generate 0x65 for the lower brightness key
     <II65> =  101;
 
+    // Required for apple/logitech_g15 keyboard
+    <II5D> = 93;
+
     // Codes generated for scancodes 0x59-0x5f, 0x62-0x76
     <K59> =   157;		// <I1D>
     <K5A> =   170;		// <I2A>
@@ -360,7 +363,7 @@ xkb_keycodes "basic" {
     // Other codes never generated.  The XFree86 ddx never generates
     // these codes.
     // Thus we can use them as fake keys
-    <MDSW> =    93; // <U5D>
+    <MDSW> =     8;
     <LVL3> =   124; // <U7C>
     <ALT>  =   125; // <U7D>
     <META> =   156; // <I1C>
Index: symbols/inet
===================================================================
--- symbols/inet.orig
+++ symbols/inet
@@ -1214,7 +1214,7 @@ xkb_symbols "logitech_g15" {
     key  <K72> {         [     XF86LaunchC ] };
     key  <K74> {         [         XF86WWW ] };
     key  <K75> {         [     XF86LaunchE ] };
-    key <MDSW> {         [     XF86Launch1 ] };
+    key <II5D> {         [     XF86Launch1 ] };
     key <NFER> {         [     XF86Launch2 ] };
     key <XFER> {         [     XF86Launch8 ] };
 };
@@ -1751,7 +1751,7 @@ xkb_symbols "apple" {
     key <K5E>	{	[ F14 ]    };
     key <K5F>	{	[ F15 ]    };
     key <K6C>	{	[ XF86Eject ]    };
-    key <MDSW>	{	[ F16 ]    };
+    key <II5D>	{	[ F16 ]    };
     key <KPEQ>  {       [ KP_Equal ] };
 };