diff -Naur kbd-1.12.orig/data/keymaps/i386/include/azerty-layout.inc kbd-1.12/data/keymaps/i386/include/azerty-layout.inc
--- kbd-1.12.orig/data/keymaps/i386/include/azerty-layout.inc	2002-10-11 08:08:50.000000000 -0300
+++ kbd-1.12/data/keymaps/i386/include/azerty-layout.inc	2007-05-15 15:15:13.000000000 -0300
@@ -28,3 +28,6 @@
 keycode 48 = b
 keycode 49 = n
 #
+include "euro"
+include "windowkeys"
+include "compose"
diff -Naur kbd-1.12.orig/data/keymaps/i386/include/compose.inc kbd-1.12/data/keymaps/i386/include/compose.inc
--- kbd-1.12.orig/data/keymaps/i386/include/compose.inc	1969-12-31 21:00:00.000000000 -0300
+++ kbd-1.12/data/keymaps/i386/include/compose.inc	2007-05-15 15:14:50.000000000 -0300
@@ -0,0 +1,9 @@
+# We map the PrintScreen key (useless) and Alt+AltGr to the Compose key...
+# A really useful thing not found on normal keyboards. :/
+#
+# (c) 1999 Bernhard Rosenkränzer <bero@mandrakesoft.com>
+
+keycode  99 = Compose
+keycode 100 = AltGr
+        alt     keycode 100 = Compose
+
diff -Naur kbd-1.12.orig/data/keymaps/i386/include/euro.inc kbd-1.12/data/keymaps/i386/include/euro.inc
--- kbd-1.12.orig/data/keymaps/i386/include/euro.inc	1969-12-31 21:00:00.000000000 -0300
+++ kbd-1.12/data/keymaps/i386/include/euro.inc	2007-05-15 15:16:48.000000000 -0300
@@ -0,0 +1,11 @@
+# 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.]
+
+#
+# keysyms can't be used as they are locale dependent
+#
+
+altgr keycode  18 = 0xa4 # currency
+altgr keycode  46 = 0xa2 # cent
diff -Naur kbd-1.12.orig/data/keymaps/i386/include/linux-with-alt-and-altgr.inc kbd-1.12/data/keymaps/i386/include/linux-with-alt-and-altgr.inc
--- kbd-1.12.orig/data/keymaps/i386/include/linux-with-alt-and-altgr.inc	2002-10-11 08:08:50.000000000 -0300
+++ kbd-1.12/data/keymaps/i386/include/linux-with-alt-and-altgr.inc	2007-05-15 15:27:43.000000000 -0300
@@ -26,3 +26,5 @@
 altgr keycode  82 = Hex_0
 altgr keycode  96 = Hex_F
 altgr keycode  98 = Hex_B
+
+include "compose"
diff -Naur kbd-1.12.orig/data/keymaps/i386/include/qwerty-layout.inc kbd-1.12/data/keymaps/i386/include/qwerty-layout.inc
--- kbd-1.12.orig/data/keymaps/i386/include/qwerty-layout.inc	2002-10-11 08:08:50.000000000 -0300
+++ kbd-1.12/data/keymaps/i386/include/qwerty-layout.inc	2007-05-15 15:28:47.000000000 -0300
@@ -28,3 +28,6 @@
 keycode 49 = n
 keycode 50 = m
 #
+include "euro"
+include "windowkeys"
+include "compose"
diff -Naur kbd-1.12.orig/data/keymaps/i386/include/qwertz-layout.inc kbd-1.12/data/keymaps/i386/include/qwertz-layout.inc
--- kbd-1.12.orig/data/keymaps/i386/include/qwertz-layout.inc	2002-10-11 08:08:50.000000000 -0300
+++ kbd-1.12/data/keymaps/i386/include/qwertz-layout.inc	2007-05-15 15:29:09.000000000 -0300
@@ -28,3 +28,6 @@
 keycode 49 = n
 keycode 50 = m
 #
+include "euro"
+include "windowkeys"
+include "compose"
diff -Naur kbd-1.12.orig/data/keymaps/i386/include/windowkeys.inc kbd-1.12/data/keymaps/i386/include/windowkeys.inc
--- kbd-1.12.orig/data/keymaps/i386/include/windowkeys.inc	1969-12-31 21:00:00.000000000 -0300
+++ kbd-1.12/data/keymaps/i386/include/windowkeys.inc	2007-05-15 15:29:36.000000000 -0300
@@ -0,0 +1,6 @@
+# Extra 105 windows keys
+
+keycode 125 = Decr_Console
+keycode 126 = Incr_Console
+keycode 127 = Compose
+
diff -Naur kbd-1.12.orig/data/keymaps/i386/qwerty/jp106.map kbd-1.12/data/keymaps/i386/qwerty/jp106.map
--- kbd-1.12.orig/data/keymaps/i386/qwerty/jp106.map	2002-10-11 08:08:49.000000000 -0300
+++ kbd-1.12/data/keymaps/i386/qwerty/jp106.map	2007-05-15 15:34:58.000000000 -0300
@@ -62,5 +62,7 @@
 keycode  92 = space
 keycode  94 = space
 keycode  97 = Control
+keycode 111 = Remove
+    control alt     keycode 111 = Boot
 keycode 124 = backslash        bar
 	control	keycode 124 = Control_backslash
diff -Naur kbd-1.12.orig/data/keymaps/sun/meta_keys.inc kbd-1.12/data/keymaps/sun/meta_keys.inc
--- kbd-1.12.orig/data/keymaps/sun/meta_keys.inc	1969-12-31 21:00:00.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/meta_keys.inc	2007-05-15 15:37:26.000000000 -0300
@@ -0,0 +1,10 @@
+#
+# defined the Meta keys to be consistent with PC keyboards
+#
+
+# Left Meta-key, unused at this time
+keycode 0x78 = Decr_Console
+# Right Meta-key, again unused
+keycode 0x7a = Incr_Console
+# Compose key
+keycode 0x43 = Compose
diff -Naur kbd-1.12.orig/data/keymaps/sun/sundvorak.map kbd-1.12/data/keymaps/sun/sundvorak.map
--- kbd-1.12.orig/data/keymaps/sun/sundvorak.map	2002-10-11 08:08:52.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/sundvorak.map	2007-05-15 15:44:43.000000000 -0300
@@ -1,6 +1,7 @@
 # Dvorak keyboard map for the 
 # Sun Type4/Type5 keyboards found on SparcStations
 keymaps 0-2,4-5,8,12
+include "meta_keys"
 strings as usual
 compose as usual for "iso-8859-1"
 #
@@ -168,9 +169,8 @@
        alt     keycode                         0x41 = Meta_backslash
 keycode 0x42 = Delete          Delete
        control keycode                         0x42 = BackSpace
-       alt     keycode                         0x43 = Meta_Delete
+       alt     keycode                         0x42 = Meta_Delete
        control alt     keycode                 0x42 = Boot
-keycode 0x43 = Compose
 keycode 0x44 = KP_7
        alt     keycode                         0x44 = Ascii_7
        altgr   keycode                         0x44 = Hex_7
@@ -262,13 +262,9 @@
 keycode 0x75 =
 keycode 0x76 = Help
 keycode 0x77 = Caps_Lock
-# A True Meta-key, unused at this time
-keycode 0x78 =
 keycode 0x79 = space           space
        control keycode                         0x79 = nul
        alt     keycode                         0x79 = Meta_space
-# Another real Meta-key, again unused
-keycode 0x7a =
 keycode 0x7b = Next
        shift   keycode                         0x7b = Scroll_Forward
 # No keys produce the following
diff -Naur kbd-1.12.orig/data/keymaps/sun/sunkeymap.map kbd-1.12/data/keymaps/sun/sunkeymap.map
--- kbd-1.12.orig/data/keymaps/sun/sunkeymap.map	2002-10-11 08:08:51.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/sunkeymap.map	2007-05-15 15:46:02.000000000 -0300
@@ -1,6 +1,7 @@
 # Keyboard map for the Sun Type4/Type5 keyboards
 # found on SparcStations
 keymaps 0-2,4-5,8,12
+include "meta_keys"
 strings as usual
 compose as usual for "iso-8859-1"
 #
@@ -164,7 +165,6 @@
        control keycode                         0x42 = BackSpace
        alt     keycode                         0x42 = Meta_Delete
        control alt     keycode                 0x42 = Boot
-keycode 0x43 = Compose
 keycode 0x44 = KP_7
        alt     keycode                         0x44 = Ascii_7
        altgr   keycode                         0x44 = Hex_7
@@ -262,13 +262,9 @@
 keycode 0x75 =
 keycode 0x76 = Help
 keycode 0x77 = Caps_Lock
-# A True Meta-key, unused at this time
-keycode 0x78 =
 keycode 0x79 = space           space
        control keycode                         0x79 = nul
        alt     keycode                         0x79 = Meta_space
-# Another real Meta-key, again unused
-keycode 0x7a =
 keycode 0x7b = Next
        shift   keycode                         0x7b = Scroll_Forward
 # No keys produce the following
diff -Naur kbd-1.12.orig/data/keymaps/sun/sun-pl-altgraph.map kbd-1.12/data/keymaps/sun/sun-pl-altgraph.map
--- kbd-1.12.orig/data/keymaps/sun/sun-pl-altgraph.map	2002-10-11 08:08:51.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/sun-pl-altgraph.map	2007-05-15 15:41:59.000000000 -0300
@@ -2,6 +2,7 @@
 # found on SparcStations
 # Polish version - 1998 rzm@icm.edu.pl
 keymaps 0-5,8,12
+include "meta_keys"
 #
 #
 # Stop/L1
@@ -165,9 +166,8 @@
 	alt	keycode				0x41 = Meta_bracketright
 keycode 0x42 = Delete		Delete
 	control	keycode				0x42 = BackSpace
-	alt	keycode				0x43 = Meta_Delete
+	alt	keycode				0x42 = Meta_Delete
 	control	alt	keycode			0x42 = Boot
-keycode 0x43 = Compose
 keycode 0x44 = KP_7
 	alt	keycode				0x44 = Ascii_7
 	altgr	keycode				0x44 = Hex_7
@@ -279,13 +279,9 @@
 keycode 0x75 =
 keycode 0x76 = Help
 keycode 0x77 = Caps_Lock
-# A True Meta-key, unused at this time
-keycode 0x78 =
 keycode 0x79 = space		space
 	control	keycode				0x79 = nul
 	alt	keycode				0x79 = Meta_space
-# Another real Meta-key, again unused
-keycode 0x7a =
 keycode 0x7b = Next
 	shift	keycode				0x7b = Scroll_Forward
 # No keys produce the following
diff -Naur kbd-1.12.orig/data/keymaps/sun/sun-pl.map kbd-1.12/data/keymaps/sun/sun-pl.map
--- kbd-1.12.orig/data/keymaps/sun/sun-pl.map	2002-10-11 08:08:51.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/sun-pl.map	2007-05-15 15:43:38.000000000 -0300
@@ -5,6 +5,7 @@
 # 19980221 Meta_R used as CtrlR
 #
 keymaps 0-5,8,12,128-129
+include "meta_keys"
 #
 #
 # Stop/L1
@@ -172,9 +173,8 @@
 	alt	keycode				0x41 = Meta_bracketright
 keycode 0x42 = Delete		Delete
 	control	keycode				0x42 = BackSpace
-	alt	keycode				0x43 = Meta_Delete
+	alt	keycode				0x42 = Meta_Delete
 	control	alt	keycode			0x42 = Boot
-keycode 0x43 = Compose
 keycode 0x44 = KP_7
 	alt	keycode				0x44 = Ascii_7
 	AltGr	keycode				0x44 = Hex_7
@@ -300,8 +300,6 @@
 keycode 0x75 =
 keycode 0x76 = Help
 keycode 0x77 = Caps_Lock
-# A True Meta-key, unused at this time
-keycode 0x78 =
 keycode 0x79 = space		space
 	control	keycode				0x79 = nul
 	alt	keycode				0x79 = Meta_space
diff -Naur kbd-1.12.orig/data/keymaps/sun/sunt4-es.map kbd-1.12/data/keymaps/sun/sunt4-es.map
--- kbd-1.12.orig/data/keymaps/sun/sunt4-es.map	2002-10-11 08:08:51.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/sunt4-es.map	2007-05-15 15:47:53.000000000 -0300
@@ -3,6 +3,7 @@
 # Antoni Pàmies Olivé <toni@readysoft.net>
 #
 keymaps 0-2,4-5,8-9,12
+include "meta_keys"
 strings as usual
 compose as usual for "iso-8859-1"
 
@@ -157,8 +158,7 @@
        alt     keycode  65 = Meta_bracketright
 keycode  66 = Delete           Delete
        control keycode  66 = BackSpace
-keycode  67 = Compose
-       alt     keycode  67 = Meta_Delete
+       alt     keycode  66 = Meta_Delete
 keycode  68 = KP_7
        altgr   keycode  68 = Hex_7
        alt     keycode  68 = Ascii_7
@@ -245,11 +245,9 @@
 keycode 117 =
 keycode 118 = Help
 keycode 119 = Control
-keycode 120 =
 keycode 121 = space            space
        control keycode 121 = nul
        alt     keycode 121 = Meta_space
-keycode 122 =
 keycode 123 = Next
        shift   keycode 123 = Scroll_Forward
 keycode 124 = less greater
diff -Naur kbd-1.12.orig/data/keymaps/sun/sunt5-cz-us.map kbd-1.12/data/keymaps/sun/sunt5-cz-us.map
--- kbd-1.12.orig/data/keymaps/sun/sunt5-cz-us.map	2002-10-11 08:08:52.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/sunt5-cz-us.map	2007-05-15 15:48:53.000000000 -0300
@@ -9,6 +9,7 @@
 # Supports Euro: AltGr+E is Euro, AltGr+C is Cent (in US keymap only),
 # Compose e = is Euro.
 keymaps 0-5,8,12,64-79
+include "meta_keys"
 strings as usual
 charset "iso-8859-2"
 #
diff -Naur kbd-1.12.orig/data/keymaps/sun/sunt5-de-latin1.map kbd-1.12/data/keymaps/sun/sunt5-de-latin1.map
--- kbd-1.12.orig/data/keymaps/sun/sunt5-de-latin1.map	2002-10-11 08:08:51.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/sunt5-de-latin1.map	2007-05-15 15:50:56.000000000 -0300
@@ -2,6 +2,7 @@
 # Fri Oct 25 1996, Wolfgang Szöcs <wolfi@tfh-berlin.de>
 #
 keymaps 0-2,4-5,8,12
+include "meta_keys"
 strings as usual
 compose as usual for "iso-8859-1"
 
@@ -150,8 +151,7 @@
        alt     keycode  65 = Meta_bracketright
 keycode  66 = Delete           Delete
        control keycode  66 = BackSpace
-keycode  67 = Compose
-       alt     keycode  67 = Meta_Delete
+       alt     keycode  66 = Meta_Delete
 keycode  68 = KP_7
        altgr   keycode  68 = Hex_7
        alt     keycode  68 = Ascii_7
@@ -236,11 +236,9 @@
 keycode 117 =
 keycode 118 = Help
 keycode 119 = Caps_Lock
-keycode 120 =
 keycode 121 = space            space
        control keycode 121 = nul
        alt     keycode 121 = Meta_space
-keycode 122 =
 keycode 123 = Next
        shift   keycode 123 = Scroll_Forward
 keycode 124 = less greater bar
diff -Naur kbd-1.12.orig/data/keymaps/sun/sunt5-es.map kbd-1.12/data/keymaps/sun/sunt5-es.map
--- kbd-1.12.orig/data/keymaps/sun/sunt5-es.map	2002-10-11 08:08:51.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/sunt5-es.map	2007-05-15 15:52:28.000000000 -0300
@@ -7,6 +7,7 @@
 # Julio Sanchez <jsanchez@gmv.es>
 #
 keymaps 0-2,4-5,8-9,12
+include "meta_keys"
 strings as usual
 compose as usual for "iso-8859-1"
 
@@ -163,8 +164,7 @@
        alt     keycode  65 = Meta_bracketright
 keycode  66 = Delete           Delete
        control keycode  66 = BackSpace
-keycode  67 = Compose
-       alt     keycode  67 = Meta_Delete
+       alt     keycode  66 = Meta_Delete
 keycode  68 = KP_7
        altgr   keycode  68 = Hex_7
        alt     keycode  68 = Ascii_7
@@ -251,11 +251,9 @@
 keycode 117 =
 keycode 118 = Help
 keycode 119 = Caps_Lock
-keycode 120 =
 keycode 121 = space            space
        control keycode 121 = nul
        alt     keycode 121 = Meta_space
-keycode 122 =
 keycode 123 = Next
        shift   keycode 123 = Scroll_Forward
 keycode 124 = less greater
diff -Naur kbd-1.12.orig/data/keymaps/sun/sunt5-fi-latin1.map kbd-1.12/data/keymaps/sun/sunt5-fi-latin1.map
--- kbd-1.12.orig/data/keymaps/sun/sunt5-fi-latin1.map	2002-10-11 08:08:51.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/sunt5-fi-latin1.map	2007-05-15 15:54:18.000000000 -0300
@@ -5,6 +5,7 @@
 # $Id: sun5-fi-latin1.map,v 1.2 1997/01/09 09:03:59 mesrik Exp $
 #
 keymaps 0-2,4-5,8,12
+include "meta_keys"
 strings as usual
 compose as usual for "iso-8859-1"
 
@@ -153,8 +154,7 @@
        alt     keycode  65 = Meta_bracketright
 keycode  66 = Delete           Delete
        control keycode  66 = BackSpace
-keycode  67 = Compose
-       alt     keycode  67 = Meta_Delete
+       alt     keycode  66 = Meta_Delete
 keycode  68 = KP_7
        altgr   keycode  68 = Hex_7
        alt     keycode  68 = Ascii_7
@@ -239,12 +239,9 @@
 keycode 117 =
 keycode 118 = Help
 keycode 119 = Caps_Lock
-keycode 120 =
-keycode 120 =
 keycode 121 = space            space
        control keycode 121 = nul
        alt     keycode 121 = Meta_space
-keycode 122 =
 keycode 123 = Next
        shift   keycode 123 = Scroll_Forward
 keycode 124 = less greater bar
diff -Naur kbd-1.12.orig/data/keymaps/sun/sunt5-fr-latin1.map kbd-1.12/data/keymaps/sun/sunt5-fr-latin1.map
--- kbd-1.12.orig/data/keymaps/sun/sunt5-fr-latin1.map	2002-10-11 08:08:51.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/sunt5-fr-latin1.map	2007-05-15 15:55:55.000000000 -0300
@@ -1,6 +1,7 @@
 # Keyboard map for the Sun Type4/Type5 keyboards
 # found on SparcStations
 keymaps 0-2,4-5,8,12
+include "meta_keys"
 strings as usual
 compose as usual for "iso-8859-1"
 #
@@ -165,7 +166,6 @@
        control keycode                         0x42 = BackSpace
        alt     keycode                         0x43 = Meta_Delete
        control alt     keycode                 0x42 = Boot
-keycode 0x43 = Compose
 keycode 0x44 = KP_7
        alt     keycode                         0x44 = Ascii_7
        altgr   keycode                         0x44 = Hex_7
@@ -263,13 +263,9 @@
 keycode 0x75 =
 keycode 0x76 = Help
 keycode 0x77 = Caps_Lock
-# A True Meta-key, unused at this time
-keycode 0x78 =
 keycode 0x79 = space           space
        control keycode                         0x79 = nul
        alt     keycode                         0x79 = Meta_space
-# Another real Meta-key, again unused
-keycode 0x7a =
 keycode 0x7b = Next
        shift   keycode                         0x7b = Scroll_Forward
 keycode 0x7c = less            greater
diff -Naur kbd-1.12.orig/data/keymaps/sun/sunt5-ru.map kbd-1.12/data/keymaps/sun/sunt5-ru.map
--- kbd-1.12.orig/data/keymaps/sun/sunt5-ru.map	2002-10-11 08:08:51.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/sunt5-ru.map	2007-05-15 15:57:03.000000000 -0300
@@ -5,6 +5,7 @@
 # Uses KOI8-R coding without 'jo'
 #
 keymaps 0-6,8,10,12,14
+include "meta_keys"
 keycode   1 =
 keycode   2 =
 keycode   3 =
@@ -231,7 +232,6 @@
 keycode  66 = Remove
        control alt     keycode  66 = Boot
        altgr   control alt     keycode  66 = Boot
-keycode  67 =
 keycode  68 = KP_7
        alt     keycode  68 = Ascii_7
        altgr   alt     keycode  68 = Ascii_7
@@ -367,13 +367,11 @@
 keycode 117 =
 keycode 118 = Help
 keycode 119 = Caps_Lock
-keycode 120 =
 keycode 121 = space
        control keycode 121 = nul
        alt     keycode 121 = Meta_space
        altgr   control keycode 121 = nul
        altgr   alt     keycode 121 = Meta_space
-keycode 122 =
 keycode 123 = Next
        shift   keycode 123 = Scroll_Forward
        altgr   shift   keycode 123 = Scroll_Forward
diff -Naur kbd-1.12.orig/data/keymaps/sun/sunt5-uk.map kbd-1.12/data/keymaps/sun/sunt5-uk.map
--- kbd-1.12.orig/data/keymaps/sun/sunt5-uk.map	2002-10-11 08:08:52.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/sunt5-uk.map	2007-05-15 15:57:55.000000000 -0300
@@ -17,6 +17,8 @@
 !
 ! Euro support: AltGr+E is Euro, AltGr+C is Cent.
 !
+include "meta_keys"
+
 keycode   29 = Escape           Escape          
 	alt     keycode   29 = Meta_Escape     
 keycode   30 = one              exclam          
diff -Naur kbd-1.12.orig/data/keymaps/sun/sunt5-us-cz.map kbd-1.12/data/keymaps/sun/sunt5-us-cz.map
--- kbd-1.12.orig/data/keymaps/sun/sunt5-us-cz.map	2002-10-11 08:08:52.000000000 -0300
+++ kbd-1.12/data/keymaps/sun/sunt5-us-cz.map	2007-05-15 15:58:43.000000000 -0300
@@ -9,6 +9,7 @@
 # Supports Euro: AltGr+E is Euro, AltGr+C is Cent (in US keymap only),
 # Compose e = is Euro.
 keymaps 0-5,8,12,64-79
+include "meta_keys"
 strings as usual
 charset "iso-8859-2"
 #
@@ -350,7 +351,6 @@
        CtrlL   control keycode                 0x42 = BackSpace
        CtrlL   alt keycode                     0x42 = Meta_Delete
        CtrlL   control alt keycode             0x42 = Boot
-keycode 0x43 = Compose
 keycode 0x44 = KP_7
        alt     keycode                         0x44 = Ascii_7
        altgr   keycode                         0x44 = Hex_7