diff -ruN console-data-1999.08.29-old/keymaps/i386/azerty/mac-usb-be.kmap console-data-1999.08.29/keymaps/i386/azerty/mac-usb-be.kmap
--- console-data-1999.08.29-old/keymaps/i386/azerty/mac-usb-be.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/azerty/mac-usb-be.kmap	2003-03-18 10:37:51.000000000 +0000
@@ -1,9 +1,9 @@
 # mac-be.map olh@suse.de
 
 alt_is_meta
-include "mac-usb-azerty-layout"
+include "azerty-layout"
 include "mac-linux-keys-bare.inc"
-include "mac-usb-euro.kmap"
+include "euro.inc"
 compose as usual for "iso-8859-1"
 strings as usual
 
diff -ruN console-data-1999.08.29-old/keymaps/i386/azerty/mac-usb-fr_CH-latin1.kmap console-data-1999.08.29/keymaps/i386/azerty/mac-usb-fr_CH-latin1.kmap
--- console-data-1999.08.29-old/keymaps/i386/azerty/mac-usb-fr_CH-latin1.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/azerty/mac-usb-fr_CH-latin1.kmap	1970-01-01 01:00:00.000000000 +0100
@@ -1,51 +0,0 @@
-! Swiss-french keymap for PowerBook G3 (Bronze Series)
-! augmented by keys on macally ikey keyboard
-
-! Shift 1
-! AltGr 2 command key
-! Ctrl 4
-! Alt 8 option key
-! ShiftL 16 not used
-! ShiftR 32 not used
-! CtrlL 64 not used
-! CtrlR 128 not used
-
-! plain,shift,command,control,alt,ctrl-alt
-# from http://www.claudio.ch/Etc/pb-sg.kmap
-# modified by olh@suse.de from mac-de_CH
-
-alt_is_meta
-include "mac-usb-qwerty-layout"
-include "mac-linux-keys-bare.inc"
-include "mac-usb-euro.kmap"
-compose as usual for "iso-8859-1"
-strings as usual
-
-
-keycode 41 = section degree asciitilde nul Meta_asciitilde
-keycode 2 = one plus
-keycode 3 = two quotedbl at
-keycode 4 = three asterisk numbersign
-keycode 5 = four ccedilla backslash Control_backslash Meta_backslash Meta_Control_backslash
-keycode 7 = six ampersand bracketright Control_bracketright Meta_bracketright Meta_Control_bracketright
-keycode 6 = five percent bracketleft Escape bracketleft Meta_Escape
-keycode 13 = asciicircum grave Control_asciicircum Meta_asciicircum Meta_Control_asciicircum
-keycode 10 = nine parenright braceright Control_bracketright Meta_braceright Meta_Control_bracketright
-keycode 8 = seven slash bar Control_backslash Meta_bar Meta_Control_backslash
-keycode 12 = apostrophe question
-keycode 9 = eight parenleft braceleft Escape Meta_braceleft Meta_Escape
-keycode 11 = zero equal nul nul Meta_equal Meta_nul
-keycode 27 = dead_diaeresis exclam
-keycode 40 = agrave adiaeresis
-keycode 39 = eacute odiaeresis
-keycode 43 = dollar sterling
-keycode 51 = comma semicolon
-keycode 53 = minus underscore backslash Control_underscore Meta_minus Meta_Control_underscore
-keycode 52 = period colon
-keycode 86 = less greater
-keycode 26 = egrave +udiaeresis
-keycode 21 = z
-keycode 44 = y
-keycode 83 = KP_Period
-        control alt keycode 83 = Boot
-
diff -ruN console-data-1999.08.29-old/keymaps/i386/azerty/mac-usb-fr.kmap console-data-1999.08.29/keymaps/i386/azerty/mac-usb-fr.kmap
--- console-data-1999.08.29-old/keymaps/i386/azerty/mac-usb-fr.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/azerty/mac-usb-fr.kmap	2003-03-18 10:40:31.000000000 +0000
@@ -7,7 +7,7 @@
 # TODO: CONTROL AND META COMBINATIONS
 
 charset "iso-8859-1"
-include "mac-usb-azerty-layout.inc"
+include "azerty-layout.inc"
 include "mac-linux-keys-bare.inc"
 compose as usual for "iso-8859-1"
 strings as usual
diff -ruN console-data-1999.08.29-old/keymaps/i386/azerty/mac-usb-it.kmap console-data-1999.08.29/keymaps/i386/azerty/mac-usb-it.kmap
--- console-data-1999.08.29-old/keymaps/i386/azerty/mac-usb-it.kmap	1970-01-01 01:00:00.000000000 +0100
+++ console-data-1999.08.29/keymaps/i386/azerty/mac-usb-it.kmap	2003-03-18 10:38:12.000000000 +0000
@@ -0,0 +1,51 @@
+# Apple Keyboard Italiana
+# Cristiano Bertossi bertossi@polimedia.it
+# it-cris.map
+# 18 August 1998
+# modified by olh@suse.de
+
+alt_is_meta
+include "azerty-layout"
+include "mac-linux-keys-bare.inc"
+include "euro.inc"
+compose as usual for "iso-8859-1"
+strings as usual
+
+
+# Prima riga
+keycode 41 = at numbersign
+keycode 2 = ampersand one guillemotleft
+keycode 3 = quotedbl two
+keycode 4 = apostrophe three grave
+keycode 5 = parenleft four braceleft bracketleft
+keycode 6 = ccedilla five Ccedilla
+keycode 7 = egrave six
+keycode 8 = parenright seven braceright bracketright
+keycode 9 = sterling eight
+keycode 10 = agrave nine
+keycode 11 = eacute zero
+keycode 12 = minus underscore
+keycode 13 = equal plus
+keycode 14 = Delete Remove
+
+# Seconda riga
+keycode 26 = igrave asciicircum
+keycode 27 = dollar asterisk
+
+# Terza riga
+keycode 40 = ugrave percent
+keycode 43 = section degree at
+
+# Quarta riga
+keycode 86 = less greater
+keycode 46 = c C copyright
+keycode 49 = n
+altgr keycode 49 = asciitilde
+keycode 50 = comma question questiondown
+keycode 51 = semicolon period
+keycode 52 = colon slash bar backslash
+keycode 53 = ograve exclam
+
+keycode 83 = KP_Period
+        control alt keycode 83 = Boot
+
diff -ruN console-data-1999.08.29-old/keymaps/i386/include/mac-usb-azerty-layout.inc console-data-1999.08.29/keymaps/i386/include/mac-usb-azerty-layout.inc
--- console-data-1999.08.29-old/keymaps/i386/include/mac-usb-azerty-layout.inc	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/include/mac-usb-azerty-layout.inc	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-# azerty-layout
-keycode 16 = a
-keycode 17 = z
-keycode 18 = e
-keycode 19 = r
-keycode 20 = t
-keycode 21 = y
-keycode 22 = u
-keycode 23 = i
-keycode 24 = o
-keycode 25 = p
-#
-keycode 30 = q
-keycode 31 = s
-keycode 32 = d
-keycode 33 = f
-keycode 34 = g
-keycode 35 = h
-keycode 36 = j
-keycode 37 = k
-keycode 38 = l
-keycode 39 = m
-#
-keycode 44 = w
-keycode 45 = x
-keycode 46 = c
-keycode 47 = v
-keycode 48 = b
-keycode 49 = n
-#
diff -ruN console-data-1999.08.29-old/keymaps/i386/include/mac-usb-euro.kmap console-data-1999.08.29/keymaps/i386/include/mac-usb-euro.kmap
--- console-data-1999.08.29-old/keymaps/i386/include/mac-usb-euro.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/include/mac-usb-euro.kmap	1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-# Euro and cent
-# [Say: "loadkeys euro" to get Euro and cent with Alt on the positions
-# where many keyboards have E and C.
-# To get it displayed, use a latin0 (i.e., latin9) font.]
-alt keycode 18 = currency
-alt keycode 46 = cent
diff -ruN console-data-1999.08.29-old/keymaps/i386/include/mac-usb-qwerty-layout.inc console-data-1999.08.29/keymaps/i386/include/mac-usb-qwerty-layout.inc
--- console-data-1999.08.29-old/keymaps/i386/include/mac-usb-qwerty-layout.inc	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/include/mac-usb-qwerty-layout.inc	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-# qwertz-layout
-keycode 16 = q
-keycode 17 = w
-keycode 18 = e
-keycode 19 = r
-keycode 20 = t
-keycode 21 = y
-keycode 22 = u
-keycode 23 = i
-keycode 24 = o
-keycode 25 = p
-#
-keycode 30 = a
-keycode 31 = s
-keycode 32 = d
-keycode 33 = f
-keycode 34 = g
-keycode 35 = h
-keycode 36 = j
-keycode 37 = k
-keycode 38 = l
-#
-keycode 44 = z
-keycode 45 = x
-keycode 46 = c
-keycode 47 = v
-keycode 48 = b
-keycode 49 = n
-keycode 50 = m
-#
diff -ruN console-data-1999.08.29-old/keymaps/i386/include/mac-usb-qwertz-layout.inc console-data-1999.08.29/keymaps/i386/include/mac-usb-qwertz-layout.inc
--- console-data-1999.08.29-old/keymaps/i386/include/mac-usb-qwertz-layout.inc	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/include/mac-usb-qwertz-layout.inc	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-# qwertz-layout
-keycode 16 = q
-keycode 17 = w
-keycode 18 = e
-keycode 19 = r
-keycode 20 = t
-keycode 21 = z
-keycode 22 = u
-keycode 23 = i
-keycode 24 = o
-keycode 25 = p
-#
-keycode 30 = a
-keycode 31 = s
-keycode 32 = d
-keycode 33 = f
-keycode 34 = g
-keycode 35 = h
-keycode 36 = j
-keycode 37 = k
-keycode 38 = l
-#
-keycode 44 = y
-keycode 45 = x
-keycode 46 = c
-keycode 47 = v
-keycode 48 = b
-keycode 49 = n
-keycode 50 = m
-#
diff -ruN console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-dk-latin1.kmap console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-dk-latin1.kmap
--- console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-dk-latin1.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-dk-latin1.kmap	2003-03-18 10:38:39.000000000 +0000
@@ -1,13 +1,13 @@
 # mac-dk-latin1.map olh@suse.de
 
 alt_is_meta
-include "mac-usb-qwerty-layout"
+include "qwerty-layout"
 altgr keycode 16 = at
 altgr keycode 50 = mu
 #include "linux-with-alt-and-altgr"
 include "mac-linux-keys-bare.inc"
 plain keycode 83 = KP_Comma
-include "mac-usb-euro.kmap"
+include "euro.inc"
 compose as usual for "iso-8859-1"
 strings as usual
 
diff -ruN console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-es.kmap console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-es.kmap
--- console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-es.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-es.kmap	2003-03-18 10:39:37.000000000 +0000
@@ -1,6 +1,6 @@
 # mac-es.map olh@suse.de
 
-include "mac-usb-qwerty-layout.inc"
+include "qwerty-layout.inc"
 include "mac-linux-keys-bare.inc"
 strings as usual
 compose as usual for "iso-8859-1"
diff -ruN console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-fi-latin1.kmap console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-fi-latin1.kmap
--- console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-fi-latin1.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-fi-latin1.kmap	2003-03-18 10:38:57.000000000 +0000
@@ -7,9 +7,9 @@
 # also defined as an 'a', I'm not sure why.
 #
 alt_is_meta
-include "mac-usb-qwerty-layout"
+include "qwerty-layout"
 include "mac-linux-keys-bare.inc"
-include "mac-usb-euro.kmap"
+include "euro.inc"
 compose as usual for "iso-8859-1"
 strings as usual
 
diff -ruN console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-it.kmap console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-it.kmap
--- console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-it.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-it.kmap	1970-01-01 01:00:00.000000000 +0100
@@ -1,51 +0,0 @@
-# Apple Keyboard Italiana
-# Cristiano Bertossi bertossi@polimedia.it
-# it-cris.map
-# 18 August 1998
-# modified by olh@suse.de
-
-alt_is_meta
-include "mac-usb-azerty-layout"
-include "mac-linux-keys-bare.inc"
-include "mac-usb-euro.kmap"
-compose as usual for "iso-8859-1"
-strings as usual
-
-
-# Prima riga
-keycode 41 = at numbersign
-keycode 2 = ampersand one guillemotleft
-keycode 3 = quotedbl two
-keycode 4 = apostrophe three grave
-keycode 5 = parenleft four braceleft bracketleft
-keycode 6 = ccedilla five Ccedilla
-keycode 7 = egrave six
-keycode 8 = parenright seven braceright bracketright
-keycode 9 = sterling eight
-keycode 10 = agrave nine
-keycode 11 = eacute zero
-keycode 12 = minus underscore
-keycode 13 = equal plus
-keycode 14 = Delete Remove
-
-# Seconda riga
-keycode 26 = igrave asciicircum
-keycode 27 = dollar asterisk
-
-# Terza riga
-keycode 40 = ugrave percent
-keycode 43 = section degree at
-
-# Quarta riga
-keycode 86 = less greater
-keycode 46 = c C copyright
-keycode 49 = n
-altgr keycode 49 = asciitilde
-keycode 50 = comma question questiondown
-keycode 51 = semicolon period
-keycode 52 = colon slash bar backslash
-keycode 53 = ograve exclam
-
-keycode 83 = KP_Period
-        control alt keycode 83 = Boot
-
diff -ruN console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-pt-latin1.kmap console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-pt-latin1.kmap
--- console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-pt-latin1.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-pt-latin1.kmap	1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-# mac-pt-latin1.map Ricardo Cabral <bfe00991@mail.telepac.pt>
-
-include "mac-usb-qwerty-layout.inc"
-include "mac-linux-keys-bare.inc"
-include "../qwertz/mac-usb-de-latin1.kmap"
-
-keycode 21 = y
-keycode 44 = z
-keycode 86 = less greater
-keycode 2 = one exclam
-keycode 3 = two quotedbl at
-keycode 4 = three numbersign sterling
-keycode 5 = four dollar section
-keycode 6 = five percent
-keycode 7 = six ampersand
-keycode 8 = seven slash
-keycode 9 = eight parenleft braceleft
-keycode 10 = nine parenright braceright
-keycode 11 = zero equal
-keycode 12 = apostrophe question
-keycode 13 = plus asterisk
-keycode 27 = dead_acute dead_grave
-keycode 26 = masculine ordfeminine
-keycode 40 = asciitilde asciicircum
-keycode 39 = ccedilla Ccedilla
-keycode 43 = backslash bar
-keycode 51 = comma semicolon
-keycode 53 = minus underscore
-keycode 52 = period colon
-keycode 83 = KP_Period
-        control alt keycode 83 = Boot
-
diff -ruN console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-se.kmap console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-se.kmap
--- console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-se.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-se.kmap	2003-03-18 10:39:46.000000000 +0000
@@ -1,6 +1,6 @@
 # mac-se.map olh@suse.de
 
-include "mac-usb-qwerty-layout.inc"
+include "qwerty-layout.inc"
 include "mac-linux-keys-bare.inc"
 strings as usual
 compose as usual for "iso-8859-1"
diff -ruN console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-uk.kmap console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-uk.kmap
--- console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-uk.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-uk.kmap	2003-03-18 10:39:56.000000000 +0000
@@ -1,5 +1,5 @@
 # mac-uk.map olh@suse.de
-include "mac-usb-qwerty-layout.inc"
+include "qwerty-layout.inc"
 include "mac-linux-keys-bare.inc"
 strings as usual
 compose as usual for "iso-8859-1"
diff -ruN console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-us.kmap console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-us.kmap
--- console-data-1999.08.29-old/keymaps/i386/qwerty/mac-usb-us.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/qwerty/mac-usb-us.kmap	2003-03-21 20:53:26.000000000 +0000
@@ -1,57 +1,80 @@
-include "mac-usb-qwerty-layout.inc"
-include "mac-linux-keys-bare.inc"
+# Macintosh us.map
+# From Frank Murphy <fjm_maillists@yahoo.com>
+#
+keymaps 0-6,8-9,12
+alt_is_meta
+include "qwerty-layout"
+include "linux-with-alt-and-altgr"
 strings as usual
 compose as usual for "iso-8859-1"
-keycode 41 = grave asciitilde
-	control keycode 41 = nul
-	alt keycode 41 = Meta_grave
-keycode 2 = one exclam
-	alt keycode 2 = Meta_one
-keycode 3 = two at at nul nul Meta_two
-keycode 4 = three numbersign
-	control keycode 4 = Escape
-	alt keycode 4 = Meta_three
-keycode 5 = four dollar dollar Control_backslash
-	alt keycode 5 = Meta_four
-keycode 7 = six asciicircum
-	control keycode 7 = Control_asciicircum
-	alt keycode 7 = Meta_six
-keycode 6 = five percent
-	control keycode 6 = Control_bracketright
-	alt keycode 6 = Meta_five
-keycode 13 = equal plus
-	alt keycode 13 = Meta_equal
-keycode 10 = nine parenleft bracketright
-	alt keycode 10 = Meta_nine
-keycode 8 = seven ampersand braceleft Control_underscore
-	alt keycode 8 = Meta_seven
-keycode 12 = minus underscore backslash Control_underscore Control_underscore Meta_minus
-keycode 9 = eight asterisk bracketleft Delete
-	alt keycode 9 = Meta_eight
-keycode 11 = zero parenright braceright
-	alt keycode 11 = Meta_zero
-keycode 27 = bracketright braceright asciitilde Control_bracketright
-	alt keycode 27 = Meta_bracketright
-keycode 26 = bracketleft braceleft
-	control keycode 26 = Escape
-	alt keycode 26 = Meta_bracketleft
-keycode 40 = apostrophe quotedbl
-	control keycode 40 = Control_g
-	alt keycode 40 = Meta_apostrophe
-keycode 39 = semicolon colon
-	alt keycode 39 = Meta_semicolon
-keycode 43 = backslash bar
-	control keycode 43 = Control_backslash
-	alt keycode 43 = Meta_backslash
-keycode 51 = comma less
-	alt keycode 51 = Meta_comma
-keycode 53 = slash question
-	control keycode 53 = Delete
-	alt keycode 53 = Meta_slash
-keycode 52 = period greater
-	control keycode 52 = Compose
-	alt keycode 52 = Meta_period
-keycode 83 = KP_Period
-	control alt keycode 83 = Boot
-keycode 70 = Scroll_Lock Show_Memory Show_Registers Show_State
-	alt keycode 70 = Scroll_Lock
+
+keycode   1 = Escape
+keycode   2 = one              exclam           exclamdown
+keycode   3 = two              at               at
+	control	keycode   3 = nul
+	shift	control	keycode   3 = nul
+keycode   4 = three            numbersign
+	control	keycode   4 = Escape
+keycode   5 = four             dollar           dollar
+	control	keycode   5 = Control_backslash
+	shift	control	keycode   5 = Control_backslash
+keycode   6 = five             percent
+	control	keycode   6 = Control_bracketright
+keycode   7 = six              asciicircum
+	control	keycode   7 = Control_asciicircum
+keycode   8 = seven            ampersand        braceleft
+	control	keycode   8 = Control_underscore
+keycode   9 = eight            asterisk         bracketleft
+	control	keycode   9 = Delete
+keycode  10 = nine             parenleft        bracketright
+keycode  11 = zero             parenright       braceright
+keycode  12 = minus            underscore       backslash
+	control	keycode  12 = Control_underscore
+	shift	control	keycode  12 = Control_underscore
+keycode  13 = equal            plus
+keycode  14 = Delete           Remove
+	control	keycode  14 = Remove
+	shift	alt	keycode  14 = Meta_Delete
+keycode  15 = Tab              Tab
+keycode  26 = bracketleft      braceleft
+	control	keycode  26 = Escape
+keycode  27 = bracketright     braceright       asciitilde
+	control	keycode  27 = Control_bracketright
+keycode  28 = Return
+	alt	keycode  28 = Meta_Control_m
+keycode  29 = Control
+keycode  39 = semicolon        colon
+keycode  40 = apostrophe       quotedbl
+	control	keycode  40 = Control_g
+keycode  41 = grave            asciitilde
+	control	keycode  41 = nul
+keycode  42 = Shift
+keycode  43 = backslash        bar
+	control	keycode  43 = Control_backslash
+keycode  51 = comma            less             guillemotleft
+keycode  52 = period           greater          guillemotright
+	control	keycode  52 = Compose
+keycode  53 = slash            question         questiondown
+	control	keycode  53 = Delete
+	shift	control	keycode  53 = Delete
+keycode  54 = Shift
+keycode  56 = Alt # Alt/Option key left
+keycode  57 = space            space            nobreakspace
+	control	keycode  57 = nul
+keycode  58 = Caps_Lock
+keycode  70 = Scroll_Lock      Show_Memory      Show_Registers
+	control	keycode  70 = Show_State
+keycode  83 = KP_Period
+	control	alt	keycode  83 = Boot
+
+keycode 101 = Pause # Break/Pause
+	control	keycode 101 = Break # Ctrl+Break/Pause
+
+# Apple portables fn key + Apple logo key
+keycode 116 = Compose
+# Apple keypad has equal
+keycode 117 = equal
+
+# Apple logo keys
+keycode 125 = VoidSymbol # left Command/Apple key
+keycode 126 = Compose # right Command/Apple key
diff -ruN console-data-1999.08.29-old/keymaps/i386/qwertz/mac-usb-de_CH.kmap console-data-1999.08.29/keymaps/i386/qwertz/mac-usb-de_CH.kmap
--- console-data-1999.08.29-old/keymaps/i386/qwertz/mac-usb-de_CH.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/qwertz/mac-usb-de_CH.kmap	2003-03-18 10:36:48.000000000 +0000
@@ -1,23 +1,23 @@
-! Swiss-German keymap for PowerBook G3 (Bronze Series)
-! augmented by keys on macally ikey keyboard
+# Swiss-German keymap for PowerBook G3 (Bronze Series)
+# augmented by keys on macally ikey keyboard
 
-! Shift 1
-! AltGr 2 command key
-! Ctrl 4
-! Alt 8 option key
-! ShiftL 16 not used
-! ShiftR 32 not used
-! CtrlL 64 not used
-! CtrlR 128 not used
+# Shift 1
+# AltGr 2 command key
+# Ctrl 4
+# Alt 8 option key
+# ShiftL 16 not used
+# ShiftR 32 not used
+# CtrlL 64 not used
+# CtrlR 128 not used
 
-! plain,shift,command,control,alt,ctrl-alt
+# plain,shift,command,control,alt,ctrl-alt
 # from http://www.claudio.ch/Etc/pb-sg.kmap
 # modified by olh@suse.de
 
 alt_is_meta
-include "mac-usb-qwertz-layout"
+include "qwertz-layout"
 include "mac-linux-keys-bare.inc"
-include "mac-usb-euro.kmap"
+include "euro.inc"
 compose as usual for "iso-8859-1"
 strings as usual
 
diff -ruN console-data-1999.08.29-old/keymaps/i386/qwertz/mac-usb-de-latin1.kmap console-data-1999.08.29/keymaps/i386/qwertz/mac-usb-de-latin1.kmap
--- console-data-1999.08.29-old/keymaps/i386/qwertz/mac-usb-de-latin1.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/i386/qwertz/mac-usb-de-latin1.kmap	2003-03-18 10:36:19.000000000 +0000
@@ -5,13 +5,13 @@
 
 
 alt_is_meta
-include "mac-usb-qwertz-layout"
+include "qwertz-layout"
 altgr keycode 16 = at
 altgr keycode 50 = mu
 #include "linux-with-alt-and-altgr"
 include "mac-linux-keys-bare.inc"
 plain keycode 83 = KP_Comma
-include "mac-usb-euro.kmap"
+include "euro.inc"
 compose as usual for "iso-8859-1"
 strings as usual
 
diff -ruN console-data-1999.08.29-old/keymaps/i386/qwertz/mac-usb-fr_CH-latin1.kmap console-data-1999.08.29/keymaps/i386/qwertz/mac-usb-fr_CH-latin1.kmap
--- console-data-1999.08.29-old/keymaps/i386/qwertz/mac-usb-fr_CH-latin1.kmap	1970-01-01 01:00:00.000000000 +0100
+++ console-data-1999.08.29/keymaps/i386/qwertz/mac-usb-fr_CH-latin1.kmap	2003-03-18 10:36:57.000000000 +0000
@@ -0,0 +1,51 @@
+# Swiss-french keymap for PowerBook G3 (Bronze Series)
+# augmented by keys on macally ikey keyboard
+#
+# Shift 1
+# AltGr 2 command key
+# Ctrl 4
+# Alt 8 option key
+# ShiftL 16 not used
+# ShiftR 32 not used
+# CtrlL 64 not used
+# CtrlR 128 not used
+#
+# plain,shift,command,control,alt,ctrl-alt
+# from http://www.claudio.ch/Etc/pb-sg.kmap
+# modified by olh@suse.de from mac-de_CH
+
+alt_is_meta
+include "qwerty-layout"
+include "mac-linux-keys-bare.inc"
+include "euro.inc"
+compose as usual for "iso-8859-1"
+strings as usual
+
+
+keycode 41 = section degree asciitilde nul Meta_asciitilde
+keycode 2 = one plus
+keycode 3 = two quotedbl at
+keycode 4 = three asterisk numbersign
+keycode 5 = four ccedilla backslash Control_backslash Meta_backslash Meta_Control_backslash
+keycode 7 = six ampersand bracketright Control_bracketright Meta_bracketright Meta_Control_bracketright
+keycode 6 = five percent bracketleft Escape bracketleft Meta_Escape
+keycode 13 = asciicircum grave Control_asciicircum Meta_asciicircum Meta_Control_asciicircum
+keycode 10 = nine parenright braceright Control_bracketright Meta_braceright Meta_Control_bracketright
+keycode 8 = seven slash bar Control_backslash Meta_bar Meta_Control_backslash
+keycode 12 = apostrophe question
+keycode 9 = eight parenleft braceleft Escape Meta_braceleft Meta_Escape
+keycode 11 = zero equal nul nul Meta_equal Meta_nul
+keycode 27 = dead_diaeresis exclam
+keycode 40 = agrave adiaeresis
+keycode 39 = eacute odiaeresis
+keycode 43 = dollar sterling
+keycode 51 = comma semicolon
+keycode 53 = minus underscore backslash Control_underscore Meta_minus Meta_Control_underscore
+keycode 52 = period colon
+keycode 86 = less greater
+keycode 26 = egrave +udiaeresis
+keycode 21 = z
+keycode 44 = y
+keycode 83 = KP_Period
+        control alt keycode 83 = Boot
+
diff -ruN console-data-1999.08.29-old/keymaps/i386/qwertz/mac-usb-pt-latin1.kmap console-data-1999.08.29/keymaps/i386/qwertz/mac-usb-pt-latin1.kmap
--- console-data-1999.08.29-old/keymaps/i386/qwertz/mac-usb-pt-latin1.kmap	1970-01-01 01:00:00.000000000 +0100
+++ console-data-1999.08.29/keymaps/i386/qwertz/mac-usb-pt-latin1.kmap	2003-03-17 22:12:12.000000000 +0000
@@ -0,0 +1,32 @@
+# mac-pt-latin1.map Ricardo Cabral <bfe00991@mail.telepac.pt>
+
+include "qwerty-layout.inc"
+include "mac-linux-keys-bare.inc"
+include "mac-usb-de-latin1.kmap"
+
+keycode 21 = y
+keycode 44 = z
+keycode 86 = less greater
+keycode 2 = one exclam
+keycode 3 = two quotedbl at
+keycode 4 = three numbersign sterling
+keycode 5 = four dollar section
+keycode 6 = five percent
+keycode 7 = six ampersand
+keycode 8 = seven slash
+keycode 9 = eight parenleft braceleft
+keycode 10 = nine parenright braceright
+keycode 11 = zero equal
+keycode 12 = apostrophe question
+keycode 13 = plus asterisk
+keycode 27 = dead_acute dead_grave
+keycode 26 = masculine ordfeminine
+keycode 40 = asciitilde asciicircum
+keycode 39 = ccedilla Ccedilla
+keycode 43 = backslash bar
+keycode 51 = comma semicolon
+keycode 53 = minus underscore
+keycode 52 = period colon
+keycode 83 = KP_Period
+        control alt keycode 83 = Boot
+
diff -ruN console-data-1999.08.29-old/keymaps/mac/mac-de-latin1-nodeadkeys.kmap console-data-1999.08.29/keymaps/mac/mac-de-latin1-nodeadkeys.kmap
--- console-data-1999.08.29-old/keymaps/mac/mac-de-latin1-nodeadkeys.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/mac/mac-de-latin1-nodeadkeys.kmap	2003-03-17 22:14:27.000000000 +0000
@@ -2,7 +2,7 @@
 # Due to Olaf Flebbe (flebbe@pluto.tat.physik.uni-tuebingen.de)
 # Mac version from olh@suse.de
 
-include "mac-de-latin1.map"
+include "mac-de-latin1.kmap"
 
 keycode  24 = apostrophe       grave
 keycode  30 = plus             asterisk         asciitilde
diff -ruN console-data-1999.08.29-old/keymaps/mac/mac-us-dvorak.kmap console-data-1999.08.29/keymaps/mac/mac-us-dvorak.kmap
--- console-data-1999.08.29-old/keymaps/mac/mac-us-dvorak.kmap	2003-03-17 22:06:24.000000000 +0000
+++ console-data-1999.08.29/keymaps/mac/mac-us-dvorak.kmap	2003-03-18 16:28:46.000000000 +0000
@@ -14,14 +14,11 @@
 keymaps 0-2,4-5,8,12
 strings as usual
 compose as usual for "iso-8859-1"
-keycode   0 = +a                +A                Hex_A
-Control_a        Control_a        Meta_a           Meta_Control_a
+keycode   0 = +a                +A                Hex_A  Control_a        Control_a        Meta_a           Meta_Control_a
 keycode   1 = o
-keycode   2 = +e                +E                Hex_E
-Control_e        Control_e        Meta_e           Meta_Control_e
+keycode   2 = +e                +E                Hex_E Control_e        Control_e        Meta_e           Meta_Control_e
 keycode   3 = u
-keycode   4 = +d                +D                Hex_D
-Control_d        Control_d        Meta_d           Meta_Control_d
+keycode   4 = +d                +D                Hex_D Control_d        Control_d        Meta_d           Meta_Control_d
 keycode   5 = i
 keycode   6 = semicolon        colon
         alt     keycode   6 = Meta_semicolon
@@ -39,18 +36,15 @@
         control keycode  14 = Compose
         alt     keycode  14 = Meta_period
 keycode  15 = p
-keycode  16 = +f                +F                Hex_F
-Control_f        Control_f        Meta_f           Meta_Control_f
+keycode  16 = +f                +F                Hex_F Control_f        Control_f        Meta_f           Meta_Control_f
 keycode  17 = y
 keycode  18 = one              exclam
         alt     keycode  18 = Meta_one
-keycode  19 = two              at               at               nul
-nul              Meta_two
+keycode  19 = two              at               at               nul nul              Meta_two
 keycode  20 = three            numbersign
         control keycode  20 = Escape
         alt     keycode  20 = Meta_three
-keycode  21 = four             dollar           dollar
-Control_backslash
+keycode  21 = four             dollar           dollar Control_backslash
         alt     keycode  21 = Meta_four
 keycode  22 = six              asciicircum
         control keycode  22 = Control_asciicircum
@@ -62,8 +56,7 @@
         alt     keycode  24 = Meta_bracketright
 keycode  25 = nine             parenleft        bracketright
         alt     keycode  25 = Meta_nine
-keycode  26 = seven            ampersand        braceleft
-Control_underscore
+keycode  26 = seven            ampersand        braceleft Control_underscore
         alt     keycode  26 = Meta_seven
 keycode  27 = bracketleft      braceleft
         alt     keycode  27 = Meta_bracketleft
@@ -78,15 +71,13 @@
 keycode  33 = slash            question
         control keycode  33 = Delete
         alt     keycode  33 = Meta_slash
-keycode  34 = +c                +C                Hex_C
-Control_c        Control_c        Meta_c           Meta_Control_c
+keycode  34 = +c                +C                Hex_C Control_c        Control_c        Meta_c           Meta_Control_c
 keycode  35 = l
 keycode  36 = Return
         alt     keycode  36 = Meta_Control_m
 keycode  37 = n
 keycode  38 = h
-keycode  39 = minus            underscore       backslash
-Control_underscore Control_underscore Meta_minus
+keycode  39 = minus            underscore       backslash Control_underscore Control_underscore Meta_minus
 keycode  40 = t
 keycode  41 = s
 keycode  42 = backslash        bar
@@ -94,8 +85,7 @@
         alt     keycode  42 = Meta_backslash
 keycode  43 = w
 keycode  44 = z
-keycode  45 = +b                +B                Hex_B
-Control_b        Control_b        Meta_b           Meta_Control_b
+keycode  45 = +b                +B                Hex_B Control_b        Control_b        Meta_b           Meta_Control_b
 keycode  46 = m
 keycode  47 = v
 keycode  48 = Tab              Tab
@@ -166,8 +156,7 @@
 keycode  89 = KP_7
         altgr   keycode  89 = Hex_7
         alt     keycode  89 = Ascii_7
-keycode  90 = +a                +A                Hex_A
-Control_a        Control_a        Meta_a           Meta_Control_a
+keycode  90 = +a                +A                Hex_A Control_a        Control_a        Meta_a           Meta_Control_a
 keycode  91 = KP_8
         altgr   keycode  91 = Hex_8
         alt     keycode  91 = Ascii_8
diff -ruN console-data-1999.08.29-old/keymaps/Makefile.am console-data-1999.08.29/keymaps/Makefile.am
--- console-data-1999.08.29-old/keymaps/Makefile.am	1999-04-01 19:02:59.000000000 +0100
+++ console-data-1999.08.29/keymaps/Makefile.am	2003-03-18 10:35:28.000000000 +0000
@@ -16,7 +16,7 @@
 KMAP_DIRS = i386/qwertz i386/fgGIod i386/qwerty \
 	i386/dvorak i386/azerty atari sun amiga mac
 
-INC_DIRS = i386/include include
+INC_DIRS = i386/include include mac/include
 
 ALL_KDIRS = $(KMAP_DIRS) $(INC_DIRS)
 
diff -ruN console-data-1999.08.29-old/keymaps/Makefile.in console-data-1999.08.29/keymaps/Makefile.in
--- console-data-1999.08.29-old/keymaps/Makefile.in	1999-08-29 20:15:25.000000000 +0100
+++ console-data-1999.08.29/keymaps/Makefile.in	2003-03-18 10:35:38.000000000 +0000
@@ -104,7 +104,7 @@
 KMAP_DIRS = i386/qwertz i386/fgGIod i386/qwerty 	i386/dvorak i386/azerty atari sun amiga mac
 
 
-INC_DIRS = i386/include include
+INC_DIRS = i386/include include mac/include
 
 ALL_KDIRS = $(KMAP_DIRS) $(INC_DIRS)
 
diff -ruN console-data-1999.08.29-old/keymaps/sun/sun-pl-altgraph.kmap console-data-1999.08.29/keymaps/sun/sun-pl-altgraph.kmap
--- console-data-1999.08.29-old/keymaps/sun/sun-pl-altgraph.kmap	1999-08-29 20:15:30.000000000 +0100
+++ console-data-1999.08.29/keymaps/sun/sun-pl-altgraph.kmap	2003-03-18 10:47:19.000000000 +0000
@@ -2,6 +2,7 @@
 # found on SparcStations
 # Polish version - 1998 rzm@icm.edu.pl
 keymaps 0-5,8,12
+charset "iso-8859-2"
 #
 #
 # Stop/L1
diff -ruN console-data-1999.08.29-old/keymaps/sun/sun-pl.kmap console-data-1999.08.29/keymaps/sun/sun-pl.kmap
--- console-data-1999.08.29-old/keymaps/sun/sun-pl.kmap	1999-08-29 20:15:30.000000000 +0100
+++ console-data-1999.08.29/keymaps/sun/sun-pl.kmap	2003-03-18 10:47:29.000000000 +0000
@@ -5,6 +5,7 @@
 # 19980221 Meta_R used as CtrlR
 #
 keymaps 0-5,8,12,128-129
+charset "iso-8859-2"
 #
 #
 # Stop/L1
diff -ruN extras-old/keymaps/mac/include/mac-azerty-layout.inc extras/keymaps/mac/include/mac-azerty-layout.inc
--- extras-old/keymaps/mac/include/mac-azerty-layout.inc	1970-01-01 01:00:00.000000000 +0100
+++ extras/keymaps/mac/include/mac-azerty-layout.inc	2003-03-18 10:27:20.000000000 +0000
@@ -0,0 +1,30 @@
+# azerty-layout
+keycode 12 = a
+keycode 13 = z
+keycode 14 = e
+keycode 15 = r
+keycode 17 = t
+keycode 16 = y
+keycode 32 = u
+keycode 34 = i
+keycode 31 = o
+keycode 35 = p
+#
+keycode  0 = q
+keycode  1 = s
+keycode  2 = d
+keycode  3 = f 
+keycode  5 = g
+keycode  4 = h
+keycode 38 = j
+keycode 40 = k
+keycode 37 = l
+keycode 41 = m
+#
+keycode  6 = w
+keycode  7 = x
+keycode  8 = c
+keycode  9 = v
+keycode 11 = b
+keycode 45 = n
+#
diff -ruN extras-old/keymaps/mac/include/mac-qwerty-layout.inc extras/keymaps/mac/include/mac-qwerty-layout.inc
--- extras-old/keymaps/mac/include/mac-qwerty-layout.inc	1970-01-01 01:00:00.000000000 +0100
+++ extras/keymaps/mac/include/mac-qwerty-layout.inc	2003-03-18 10:27:14.000000000 +0000
@@ -0,0 +1,30 @@
+# qwertz-layout
+keycode 12 = q
+keycode 13 = w
+keycode 14 = e
+keycode 15 = r
+keycode 17 = t
+keycode 16 = y
+keycode 32 = u
+keycode 34 = i
+keycode 31 = o
+keycode 35 = p
+#
+keycode  0 = a
+keycode  1 = s
+keycode  2 = d
+keycode  3 = f
+keycode  5 = g
+keycode  4 = h
+keycode 38 = j
+keycode 40 = k
+keycode 37 = l
+#
+keycode  6 = z
+keycode  7 = x
+keycode  8 = c
+keycode  9 = v
+keycode 11 = b
+keycode 45 = n
+keycode 46 = m
+#
diff -ruN extras-old/keymaps/mac/mac-de-latin1.kmap extras/keymaps/mac/mac-de-latin1.kmap
--- extras-old/keymaps/mac/mac-de-latin1.kmap	1970-01-01 01:00:00.000000000 +0100
+++ extras/keymaps/mac/mac-de-latin1.kmap	2003-03-18 11:34:59.000000000 +0000
@@ -0,0 +1,57 @@
+# mac-de-latin1.kmap: German keymap
+# (Renamed from gr-latin1.map, since it is not a Greek map.)
+# Some changes due to Olaf Flebbe (flebbe@pluto.tat.physik.uni-tuebingen.de)
+# More changes by Jochen Hein <jochen.hein@delphi.central.de>.
+
+
+alt_is_meta
+include "include/mac-qwerty-layout"
+	altgr keycode 12 = at
+	altgr keycode 46 = mu
+#include "linux-with-alt-and-altgr"
+include "mac-linux-keys-bare.inc"
+	plain keycode  65 = KP_Comma
+include "euro.inc"
+compose as usual for "iso-8859-1"
+strings as usual
+
+#             Normal           Shift            AltGr           Strg
+#		Normal	Shift	AltGr		Shift+AltGr	Ctrl	Shift+Ctrl	AltGr+Ctrl	Shift+AltGr+Ctrl	Alt	Shift+Alt	AltGr+Alt	Shift+AltGr+Alt	
+keycode	26 =	seven	slash	braceleft	a		b	c		d		e			f	g		h		i		j	k
+keycode  18 = one              exclam
+	shift altgr keycode 18 = at
+keycode  19 = two              quotedbl         twosuperior     nul
+keycode  20 = three            section          threesuperior   Escape
+keycode  21 = four             dollar
+keycode  23 = five             percent
+keycode  22 = six              ampersand
+keycode  28 = eight            parenleft        bracketleft
+keycode  25 = nine             parenright       bracketright
+        control altgr keycode 25 = Control_bracketright
+keycode  29 = zero             equal            braceright
+keycode  27 = ssharp           question         backslash
+        control altgr keycode  27 = Control_backslash
+keycode  24 = dead_acute       dead_grave
+        alt     keycode  24 = Meta_acute
+        shift   alt   keycode  24 = Meta_grave
+keycode  33 = +udiaeresis       +Udiaeresis
+keycode  30 = plus             asterisk         dead_tilde
+keycode  41 = +odiaeresis       +Odiaeresis
+keycode  39 = +adiaeresis       +Adiaeresis
+keycode  10 = dead_circumflex   degree   Meta_asciicircum        Control_asciicircum
+keycode  42 = numbersign       apostrophe
+keycode  43 = comma            semicolon
+keycode  47 = period           colon
+keycode  44 = minus            underscore       Meta_minus
+        shift control keycode 44 = Control_underscore
+keycode  49 = space            space            Meta_space      nul
+keycode  10 = less             greater          bar
+
+keycode  16 = z
+keycode   6 = y
+
+	alt keycode 12 = at
+	alt keycode 50 = bar
+#	altgr keycode 26 = bar
+	alt keycode 30 = dead_tilde
+	alt keycode 45 = dead_tilde
diff -ruN extras-old/keymaps/mac/mac-es.kmap extras/keymaps/mac/mac-es.kmap
--- extras-old/keymaps/mac/mac-es.kmap	2002-12-05 16:41:06.000000000 +0000
+++ extras/keymaps/mac/mac-es.kmap	2003-03-18 16:26:05.000000000 +0000
@@ -1,6 +1,6 @@
 # mac-es.kmap  olh@suse.de
 
-include "mac-qwerty-layout.inc"
+include "include/mac-qwerty-layout.inc"
 include "mac-linux-keys-bare.inc"
 strings as usual
 compose as usual for "iso-8859-1"
diff -ruN extras-old/keymaps/mac/mac-fi-latin1.kmap extras/keymaps/mac/mac-fi-latin1.kmap
--- extras-old/keymaps/mac/mac-fi-latin1.kmap	2002-12-05 16:38:17.000000000 +0000
+++ extras/keymaps/mac/mac-fi-latin1.kmap	2003-03-18 16:25:11.000000000 +0000
@@ -7,9 +7,9 @@
 # also defined as an 'a', I'm not sure why.
 #
 alt_is_meta
-include "mac-qwerty-layout"
+include "include/mac-qwerty-layout"
 include "mac-linux-keys-bare.inc"
-include "mac-euro.map"
+include "euro.inc"
 compose as usual for "iso-8859-1"
 strings as usual
 
diff -ruN extras-old/keymaps/mac/mac-fr.kmap extras/keymaps/mac/mac-fr.kmap
--- extras-old/keymaps/mac/mac-fr.kmap	2002-12-05 16:38:29.000000000 +0000
+++ extras/keymaps/mac/mac-fr.kmap	2003-03-18 10:51:00.000000000 +0000
@@ -7,7 +7,7 @@
 # TODO: CONTROL AND META COMBINATIONS
 
 charset "iso-8859-1"
-include "mac-azerty-layout.inc"
+include "include/mac-azerty-layout.inc"
 include "mac-linux-keys-bare.inc"
 compose as usual for "iso-8859-1"
 strings as usual
diff -ruN extras-old/keymaps/mac/mac-it.kmap extras/keymaps/mac/mac-it.kmap
--- extras-old/keymaps/mac/mac-it.kmap	2002-12-05 16:43:41.000000000 +0000
+++ extras/keymaps/mac/mac-it.kmap	2003-03-18 11:11:44.000000000 +0000
@@ -5,9 +5,9 @@
 # modified by olh@suse.de
 
 alt_is_meta
-include "mac-azerty-layout"
+include "include/mac-azerty-layout"
 include "mac-linux-keys-bare.inc"
-include "mac-euro.map"
+include "euro.inc"
 compose as usual for "iso-8859-1"
 strings as usual
 
diff -ruN extras-old/keymaps/mac/mac-pt-latin1.kmap extras/keymaps/mac/mac-pt-latin1.kmap
--- extras-old/keymaps/mac/mac-pt-latin1.kmap	2002-12-05 16:44:47.000000000 +0000
+++ extras/keymaps/mac/mac-pt-latin1.kmap	2003-03-18 11:11:58.000000000 +0000
@@ -1,8 +1,8 @@
 # mac-pt-latin1.kmap  Ricardo Cabral <bfe00991@mail.telepac.pt>
 
-include "mac-qwerty-layout.inc"
+include "include/mac-qwerty-layout.inc"
 include "mac-linux-keys-bare.inc"
-include "mac-de-latin1.map"
+include "mac-de-latin1.kmap"
 
 keycode 16 = y
 keycode 6  = z
diff -ruN extras-old/keymaps/mac/mac-se.kmap extras/keymaps/mac/mac-se.kmap
--- extras-old/keymaps/mac/mac-se.kmap	2002-12-05 16:43:08.000000000 +0000
+++ extras/keymaps/mac/mac-se.kmap	2003-03-18 10:51:18.000000000 +0000
@@ -1,6 +1,6 @@
 # mac-se.kmap  olh@suse.de
 
-include "mac-qwerty-layout.inc"
+include "include/mac-qwerty-layout.inc"
 include "mac-linux-keys-bare.inc"
 strings as usual
 compose as usual for "iso-8859-1"
diff -ruN extras-old/keymaps/mac/mac-uk.kmap extras/keymaps/mac/mac-uk.kmap
--- extras-old/keymaps/mac/mac-uk.kmap	2002-12-05 16:45:05.000000000 +0000
+++ extras/keymaps/mac/mac-uk.kmap	2003-03-18 10:51:24.000000000 +0000
@@ -1,5 +1,5 @@
 # mac-uk.kmap  olh@suse.de
-include "mac-qwerty-layout.inc"
+include "include/mac-qwerty-layout.inc"
 include "mac-linux-keys-bare.inc"
 strings as usual
 compose as usual for "iso-8859-1"
diff -ruN extras-old/keymaps/mac/mac-us.kmap extras/keymaps/mac/mac-us.kmap
--- extras-old/keymaps/mac/mac-us.kmap	2002-12-05 16:45:13.000000000 +0000
+++ extras/keymaps/mac/mac-us.kmap	2003-03-18 10:51:39.000000000 +0000
@@ -1,5 +1,5 @@
 #keymaps 0-2,4-5,8,9,12
-include "mac-qwerty-layout.inc"
+include "include/mac-qwerty-layout.inc"
 include "mac-linux-keys-bare.inc"
 strings as usual
 compose as usual for "iso-8859-1"