diff -urN keycodes/evdev /home/daniels/tmp/xkb/keycodes/evdev
--- keycodes/evdev	2007-05-30 12:24:51.187335581 +0300
+++ /home/daniels/tmp/xkb/keycodes/evdev	2007-05-30 15:02:36.000000000 +0300
@@ -239,7 +239,7 @@
 	<I213> = 213;	// #define KEY_SUSPEND             205
 	<I214> = 214;	// #define KEY_CLOSE               206
 	<I215> = 215;	// #define KEY_PLAY                207
-	<I216> = 216;	// #define KEY_FASTFORWARD         208
+	<FN> = 216;	// #define KEY_FASTFORWARD         208
 	<I217> = 217;	// #define KEY_BASSBOOST           209
 	<I218> = 218;	// #define KEY_PRINT               210
 	<I219> = 219;	// #define KEY_HP                  211
--- keycodes/evdev	2007-05-30 12:24:51.187335581 +0300
+++ /home/daniels/tmp/xkb/keycodes/evdev	2007-05-30 15:02:36.000000000 +0300
@@ -239,7 +239,7 @@
 	<I213> = 213;	// #define KEY_SUSPEND             205
 	<I214> = 214;	// #define KEY_CLOSE               206
 	<I215> = 215;	// #define KEY_PLAY                207
-	<I216> = 216;	// #define KEY_FASTFORWARD         208
+	<FN> = 216;	// #define KEY_FASTFORWARD         208
 	<I217> = 217;	// #define KEY_BASSBOOST           209
 	<I218> = 218;	// #define KEY_PRINT               210
 	<I219> = 219;	// #define KEY_HP                  211
diff -urN rules/base /home/daniels/tmp/xkb/rules/base
--- rules/base	2007-05-30 12:24:51.399365152 +0300
+++ /home/daniels/tmp/xkb/rules/base	2007-05-30 15:02:28.000000000 +0300
@@ -49,7 +49,7 @@
 ! $nokialayouts = da de fi no ru se us
 
 ! model		=	keycodes
-  *		=	xfree86
+  *		=	evdev
 
 ! layout[1]	=	keycodes
   $azerty       =       +aliases(azerty)
diff -urN rules/xorg /home/daniels/tmp/xkb/rules/xorg
--- rules/xorg	2007-05-30 12:24:51.399365152 +0300
+++ /home/daniels/tmp/xkb/rules/xorg	2007-05-30 15:02:28.000000000 +0300
@@ -49,7 +49,7 @@
 ! $nokialayouts = da de fi no ru se us
 
 ! model		=	keycodes
-  *		=	xfree86
+  *		=	evdev
 
 ! layout[1]	=	keycodes
   $azerty       =       +aliases(azerty)
--- rules/base	2007-05-30 12:24:51.399365152 +0300
+++ /home/daniels/tmp/xkb/rules/base	2007-05-30 15:02:28.000000000 +0300
@@ -49,7 +49,7 @@
 ! $nokialayouts = da de fi no ru se us
 
 ! model		=	keycodes
-  *		=	xfree86
+  *		=	evdev
 
 ! layout[1]	=	keycodes
   $azerty       =       +aliases(azerty)
--- rules/xorg	2007-05-30 12:24:51.399365152 +0300
+++ /home/daniels/tmp/xkb/rules/xorg	2007-05-30 15:02:28.000000000 +0300
@@ -49,7 +49,7 @@
 ! $nokialayouts = da de fi no ru se us
 
 ! model		=	keycodes
-  *		=	xfree86
+  *		=	evdev
 
 ! layout[1]	=	keycodes
   $azerty       =       +aliases(azerty)
diff -urN symbols/nokia_vndr/nokia /home/daniels/tmp/xkb/symbols/nokia_vndr/nokia
--- symbols/nokia_vndr/nokia	2007-05-30 12:24:51.855428759 +0300
+++ /home/daniels/tmp/xkb/symbols/nokia_vndr/nokia	2007-05-30 15:02:33.000000000 +0300
@@ -22,6 +22,7 @@
     key <AC08>	{	[	k,		K,		parenright	]	};
     // yes, numbersign really is repeated.
     key <AC09>	{	[	l,		L,		numbersign	]	};
+    key <AC11>  {       [       apostrophe,     question,       asterisk        ]       };
     // broken UI spec in da hizzouse.
     key <RTRN>	{	[	KP_Enter					]	};
 
@@ -32,11 +33,20 @@
     key <AB05>	{	[	b,		B,		plus		]	};
     key <AB06>	{	[	n,		N,		dollar		]	};
     key <AB07>	{	[	m,		M,		yen		]	};
+    key <AC10>  {       [       semicolon,      colon,          colon           ]       };
+    key <AE11>  {       [       minus,          underscore,     underscore      ]       };
+    key <AE12>  {       [       plus,           equal,          equal           ]       };
 
-    key <COMP>	{	[	Multi_Key					]	};
+    key <COMP>	{	[	Multi_key					]	};
     key <LFSH>	{	[	Shift_L						]	};
+    modifier_map Shift { Shift_L };
     key <FN>	{	[	ISO_Level3_Shift				]	};
+    modifier_map Mod5 { ISO_Level3_Shift };
+    key <SPCE>  {       [       space,          space,          space          ]       };
+    key <AB08>  {       [       comma,          less,           less           ]       };
+    key <AB09>  {       [       period,         greater,        greater        ]       };
     key <RCTL>	{	[	Control_R					]	};
+    modifier_map Control { Control_R };
 
     key <KPEN>	{	[	Return						]	};
     key <UP>	{	[	Up						]	};
diff -urN symbols/nokia_vndr/nokia /home/daniels/tmp/xkb/symbols/nokia_vndr/nokia
--- symbols/nokia_vndr/nokia	2007-05-30 12:24:51.855428759 +0300
+++ /home/daniels/tmp/xkb/symbols/nokia_vndr/nokia	2007-05-30 15:02:33.000000000 +0300
@@ -22,6 +22,7 @@
     key <AC08>	{	[	k,		K,		parenright	]	};
     // yes, numbersign really is repeated.
     key <AC09>	{	[	l,		L,		numbersign	]	};
+    key <AC11>  {       [       apostrophe,     question,       asterisk        ]       };
     // broken UI spec in da hizzouse.
     key <RTRN>	{	[	KP_Enter					]	};
 
@@ -32,11 +33,20 @@
     key <AB05>	{	[	b,		B,		plus		]	};
     key <AB06>	{	[	n,		N,		dollar		]	};
     key <AB07>	{	[	m,		M,		yen		]	};
+    key <AC10>  {       [       semicolon,      colon,          colon           ]       };
+    key <AE11>  {       [       minus,          underscore,     underscore      ]       };
+    key <AE12>  {       [       plus,           equal,          equal           ]       };
 
-    key <COMP>	{	[	Multi_Key					]	};
+    key <COMP>	{	[	Multi_key					]	};
     key <LFSH>	{	[	Shift_L						]	};
+    modifier_map Shift { Shift_L };
     key <FN>	{	[	ISO_Level3_Shift				]	};
+    modifier_map Mod5 { ISO_Level3_Shift };
+    key <SPCE>  {       [       space,          space,          space          ]       };
+    key <AB08>  {       [       comma,          less,           less           ]       };
+    key <AB09>  {       [       period,         greater,        greater        ]       };
     key <RCTL>	{	[	Control_R					]	};
+    modifier_map Control { Control_R };
 
     key <KPEN>	{	[	Return						]	};
     key <UP>	{	[	Up						]	};
--- symbols/nokia_vndr/nokia	2007-05-30 12:24:51.855428759 +0300
+++ /home/daniels/tmp/xkb/symbols/nokia_vndr/nokia	2007-05-30 15:02:33.000000000 +0300
@@ -22,6 +22,7 @@
     key <AC08>	{	[	k,		K,		parenright	]	};
     // yes, numbersign really is repeated.
     key <AC09>	{	[	l,		L,		numbersign	]	};
+    key <AC11>  {       [       apostrophe,     question,       asterisk        ]       };
     // broken UI spec in da hizzouse.
     key <RTRN>	{	[	KP_Enter					]	};
 
@@ -32,11 +33,20 @@
     key <AB05>	{	[	b,		B,		plus		]	};
     key <AB06>	{	[	n,		N,		dollar		]	};
     key <AB07>	{	[	m,		M,		yen		]	};
+    key <AC10>  {       [       semicolon,      colon,          colon           ]       };
+    key <AE11>  {       [       minus,          underscore,     underscore      ]       };
+    key <AE12>  {       [       plus,           equal,          equal           ]       };
 
-    key <COMP>	{	[	Multi_Key					]	};
+    key <COMP>	{	[	Multi_key					]	};
     key <LFSH>	{	[	Shift_L						]	};
+    modifier_map Shift { Shift_L };
     key <FN>	{	[	ISO_Level3_Shift				]	};
+    modifier_map Mod5 { ISO_Level3_Shift };
+    key <SPCE>  {       [       space,          space,          space          ]       };
+    key <AB08>  {       [       comma,          less,           less           ]       };
+    key <AB09>  {       [       period,         greater,        greater        ]       };
     key <RCTL>	{	[	Control_R					]	};
+    modifier_map Control { Control_R };
 
     key <KPEN>	{	[	Return						]	};
     key <UP>	{	[	Up						]	};
Binary files xkbcomp and /home/daniels/tmp/xkb/xkbcomp differ
