---
 data/keymaps/mac/all/mac-de-latin1-nodeadkeys.map |    2 -
 data/keymaps/mac/all/mac-de-latin1.map            |   38 ++++++++++++----------
 data/keymaps/mac/include/mac-euro2.map            |    6 +++
 3 files changed, 28 insertions(+), 18 deletions(-)

Index: kbd-1.12/data/keymaps/mac/all/mac-de-latin1-nodeadkeys.map
===================================================================
--- kbd-1.12.orig/data/keymaps/mac/all/mac-de-latin1-nodeadkeys.map
+++ kbd-1.12/data/keymaps/mac/all/mac-de-latin1-nodeadkeys.map
@@ -7,7 +7,7 @@ include "mac-de-latin1.map"
 keycode  24 = apostrophe       grave
 keycode  30 = plus             asterisk         asciitilde
 keycode  50 = asciicircum      degree
-	alt keycode 45 = asciitilde
+	altgr keycode 45 = asciitilde
 
 # corresponding keys in mac-de-latin1.map:
 # keycode  24 = dead_acute       dead_grave
Index: kbd-1.12/data/keymaps/mac/all/mac-de-latin1.map
===================================================================
--- kbd-1.12.orig/data/keymaps/mac/all/mac-de-latin1.map
+++ kbd-1.12/data/keymaps/mac/all/mac-de-latin1.map
@@ -11,22 +11,23 @@ include "mac-qwerty-layout"
 #include "linux-with-alt-and-altgr"
 include "mac-linux-keys-bare.inc"
 	plain keycode  65 = KP_Comma
-include "mac-euro.map"
+include "mac-euro2.map"
 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
+#             Normal           Shift            AltGr           Shift+AltGr	Ctrl	Shift+Ctrl	AltGr+Ctrl	Shift+AltGr+Ctrl	Alt	Shift+Alt	AltGr+Alt	Shift+AltGr+Alt
 keycode  18 = one              exclam
 	shift altgr keycode 18 = at
-keycode  19 = two              quotedbl         twosuperior     nul
-keycode  20 = three            section          threesuperior   Escape
+keycode  19 = two              quotedbl         twosuperior
+	control keycode 19 = nul
+keycode  20 = three            section          threesuperior
+	control keycode 29 = Escape
 keycode  21 = four             dollar
-keycode  23 = five             percent
-keycode  22 = six              ampersand
-keycode  28 = eight            parenleft        bracketleft
-keycode  25 = nine             parenright       bracketright
+keycode  23 = five             percent		bracketleft
+keycode  22 = six              ampersand	bracketright
+keycode  26 = seven            slash            bar
+keycode  28 = eight            parenleft        braceleft
+keycode  25 = nine             parenright       braceright
         control altgr keycode 25 = Control_bracketright
 keycode  29 = zero             equal            braceright
 keycode  27 = ssharp           question         backslash
@@ -38,20 +39,23 @@ keycode  33 = +udiaeresis       +Udiaere
 keycode  30 = plus             asterisk         dead_tilde
 keycode  41 = +odiaeresis       +Odiaeresis
 keycode  39 = +adiaeresis       +Adiaeresis
-keycode  10 = dead_circumflex   degree   Meta_asciicircum        Control_asciicircum
+keycode  50 = dead_circumflex   degree
+	alt keycode 50 = Meta_asciicircum
+	control keycode 50 = Control_asciicircum
 keycode  42 = numbersign       apostrophe
 keycode  43 = comma            semicolon
 keycode  47 = period           colon
-keycode  44 = minus            underscore       Meta_minus
+keycode  44 = minus            underscore
         shift control keycode 44 = Control_underscore
-keycode  49 = space            space            Meta_space      nul
+keycode  49 = space            space
+	control keycode 49 = nul
 keycode  10 = less             greater          bar
 
 keycode  16 = z
 keycode   6 = y
 
-	alt keycode 12 = at
-	alt keycode 50 = bar
+	altgr keycode 12 = at
+	altgr keycode 37 = at
+	altgr keycode 42 = bar
 #	altgr keycode 26 = bar
-	alt keycode 30 = dead_tilde
-	alt keycode 45 = dead_tilde
+	altgr keycode 45 = dead_tilde
Index: kbd-1.12/data/keymaps/mac/include/mac-euro2.map
===================================================================
--- /dev/null
+++ kbd-1.12/data/keymaps/mac/include/mac-euro2.map
@@ -0,0 +1,6 @@
+# Euro and cent
+# [Say: "loadkeys mac-euro2" to get Euro and cent with AltGr (Option key)
+#  on the positions where many keyboards have E and C.
+#  To get it displayed, use a latin0 (i.e., latin9) font.]
+altgr keycode  14 = currency
+altgr keycode   8 = cent