---
 keycodes/macintosh  |    2 ++
 rules/base.m_k.part |    2 +-
 rules/base.xml.in   |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

Index: xkeyboard-config-mainline/keycodes/macintosh
===================================================================
--- xkeyboard-config-mainline.orig/keycodes/macintosh
+++ xkeyboard-config-mainline/keycodes/macintosh
@@ -38,6 +38,8 @@ default xkb_keycodes "macintosh" {
    
 };
 
+// the Linux kernel is responsible for the '<>' / '^°' key swapping
+// this was finally fixed in 2.6.18.3 and 2.6.19
 xkb_keycodes "badmap" {
     <TLDE> =  94;
     <LSGT> =  49;
Index: xkeyboard-config-mainline/rules/base.m_k.part
===================================================================
--- xkeyboard-config-mainline.orig/rules/base.m_k.part
+++ xkeyboard-config-mainline/rules/base.m_k.part
@@ -7,6 +7,6 @@
   jp106		=	xfree86(jp106)
   evdev		=	evdev
   macintosh_old	=	macintosh(old)
- $macbooks	=	macintosh+macintosh(badmap)
+ $macbooks	=	macintosh
  $macs   	=	macintosh
   *		=	xfree86
Index: xkeyboard-config-mainline/rules/base.xml.in
===================================================================
--- xkeyboard-config-mainline.orig/rules/base.xml.in
+++ xkeyboard-config-mainline/rules/base.xml.in
@@ -3438,7 +3438,7 @@
       <option>
         <configItem>
           <name>apple:badmap</name>
-          <_description>Swap keycodes of two keys when Mac keyboards are misdetected by kernel.</_description>
+          <_description>Swap keycodes of two keys when Mac keyboards are not handled correctly by kernel.</_description>
         </configItem>
       </option>
     </group>