diff -uNr xc/programs/xkbcomp/keycodes/evdev xc-new/programs/xkbcomp/keycodes/evdev
--- xc/programs/xkbcomp/keycodes/evdev	1970-01-01 03:00:00.000000000 +0300
+++ xc-new/programs/xkbcomp/keycodes/evdev	2006-01-23 03:21:12.000000000 +0300
@@ -0,0 +1,355 @@
+// translation from evdev scancodes to something resembling xfree86 keycodes.
+
+default xkb_keycodes "evdev" {
+	minimum = 8;
+	maximum = 255;
+
+	<TLDE> = 49;
+	<AE01> = 10;
+	<AE02> = 11;
+	<AE03> = 12;
+	<AE04> = 13;
+	<AE05> = 14;
+	<AE06> = 15;
+	<AE07> = 16;
+	<AE08> = 17;
+	<AE09> = 18;
+	<AE10> = 19;
+	<AE11> = 20;
+	<AE12> = 21;
+	<BKSP> = 22;
+
+	<TAB> = 23;
+	<AD01> = 24;
+	<AD02> = 25;
+	<AD03> = 26;
+	<AD04> = 27;
+	<AD05> = 28;
+	<AD06> = 29;
+	<AD07> = 30;
+	<AD08> = 31;
+	<AD09> = 32;
+	<AD10> = 33;
+	<AD11> = 34;
+	<AD12> = 35;
+	<BKSL> = 51;
+	<RTRN> = 36;
+
+	<CAPS> = 66;
+	<AC01> = 38;
+	<AC02> = 39;
+	<AC03> = 40;
+	<AC04> = 41;
+	<AC05> = 42;
+	<AC06> = 43;
+	<AC07> = 44;
+	<AC08> = 45;
+	<AC09> = 46;
+	<AC10> = 47;
+	<AC11> = 48;
+
+	<LFSH> = 50;
+	<AB01> = 52;
+	<AB02> = 53;
+	<AB03> = 54;
+	<AB04> = 55;
+	<AB05> = 56;
+	<AB06> = 57;
+	<AB07> = 58;
+	<AB08> = 59;
+	<AB09> = 60;
+	<AB10> = 61;
+	<RTSH> = 62;
+
+	<LALT> = 64;
+	<LCTL> = 37;
+	<SPCE> = 65;
+	<RCTL> = 105;
+	<RALT> = 108;
+	// Microsoft keyboard extra keys
+	<LWIN> = 133;
+	<RWIN> = 134;
+	<MENU> = 135;
+
+	<ESC> = 9;
+	<FK01> = 67;
+	<FK02> = 68;
+	<FK03> = 69;
+	<FK04> = 70;
+	<FK05> = 71;
+	<FK06> = 72;
+	<FK07> = 73;
+	<FK08> = 74;
+	<FK09> = 75;
+	<FK10> = 76;
+	<FK11> = 95;
+	<FK12> = 96;
+
+	<PRSC> = 107;
+	// <SYRQ> = 107;
+	<SCLK> = 78;
+	<PAUS> = 127;
+	// <BRK> = 419;
+
+	<INS> = 118;
+	<HOME> = 110;
+	<PGUP> = 112;
+	<DELE> = 119;
+	<END> = 115;
+	<PGDN> = 117;
+
+	<UP> = 111;
+	<LEFT> = 113;
+	<DOWN> = 116;
+	<RGHT> = 114;
+
+	<NMLK> = 77;
+	<KPDV> = 106;
+	<KPMU> = 63;
+	<KPSU> = 82;
+
+	<KP7> = 79;
+	<KP8> = 80;
+	<KP9> = 81;
+	<KPAD> = 86;
+
+	<KP4> = 83;
+	<KP5> = 84;
+	<KP6> = 85;
+
+	<KP1> = 87;
+	<KP2> = 88;
+	<KP3> = 89;
+	<KPEN> = 104;
+
+	<KP0> = 90;
+	<KPDL> = 91;
+	// <KPEQ> = 126;
+
+	<FK13> = 191;
+	<FK14> = 192;
+	<FK15> = 193;
+	<FK16> = 194;
+	<FK17> = 195;
+	// <KPDC> = 123;
+
+	// Keys that are generated on Japanese keyboards
+
+	// alias <HZTG> = <TLDE>;	// Hankaku_Zenkaku toggle
+	// <HZTG> =  85;               // Hankaku/Zenkakau toggle
+	// <HKTG> =  93;		// Hiragana/Katakana toggle
+	// <AB11> = 211;		// backslash/underscore
+	// <XFER> =  92;		// Henkan
+	// <NFER> =  94;		// Muhenkan
+	// <AE13> = 124;		// Yen
+
+	// Keys that are generated on Korean keyboards
+
+	// alias <HNGL> = <FK16>;     // Hangul Latin toggle
+	// alias <HJCV> = <FK17>;     // Hangul to Hanja conversion
+	<HNGL> = 130;
+	<HJCV> = 131;
+
+	// Extended keys that may be generated on "Internet" keyboards.
+	// These are not standardised, hence the meaningless names.
+	// The entries commented out are never generated because the raw codes
+	// in those positions are already used for well-defined keys.
+
+	// evdev does standardize names for these though.  comment them
+	// all out for now.
+
+	// alias <I01> = <XFER>;
+	// <I02> =   130;
+	// alias <I03> = <NFER>;
+	// <I04> =   132;
+	// alias <I05> = <AE13>;
+	// <I06> =   134;
+	// <I07> =   135;
+	// <I08> =   136;
+	// <I09> =   137;
+	// <I0A> =   138;
+	// <I0B> =   139;
+	// <I0C> =   140;
+	// <I0D> =   141;
+	// <I0E> =   142;
+	// <I0F> =   143;
+	// <I10> =   144;
+	// <I11> =   145;
+	// <I12> =   146;
+	// <I13> =   147;
+	// <I14> =   148;
+	// <I15> =   149;
+	// <I16> =   150;
+	// <I17> =   151;
+	// <I18> =   152;
+	// <I19> =   153;
+	// <I1A> =   154;
+	// <I1B> =   155;
+	// <I1C> =   156;	<META>
+	// <I1D> =   157;	<K59>
+	// <I1E> =   158;
+	// <I1F> =   159;
+	// <I20> =   160;
+	// <I21> =   161;
+	// <I22> =   162;
+	// <I23> =   163;
+	// <I24> =   164;
+	// <I25> =   165;
+	// <I26> =   166;
+	// <I27> =   167;
+	// <I28> =   168;
+	// <I29> =   169;
+	// <I2A> =   170;	<K5A>
+	// <I2B> =   171;
+	// <I2C> =   172;
+	// <I2D> =   173;
+	// <I2E> =   174;
+	// <I2F> =   175;
+	// <I30> =   176;
+	// <I31> =   177;
+	// <I32> =   178;
+	// <I33> =   179;
+	// <I34> =   180;
+	// <I35> =   181;	<K5B>
+	// <I36> =   182;	<K5D>
+	// <I37> =   183;	<K5E>
+	// <I38> =   184;	<K5F>
+	// <I39> =   185;
+	// <I3A> =   186;
+	// <I3B> =   187;
+	// <I3C> =   188;
+	// <I3D> =   189;	<K62>
+	// <I3E> =   190;	<K63>
+	// <I3F> =   191;	<K64>
+	// <I40> =   192;	<K65>
+	// <I41> =   193;	<K66>
+	// <I42> =   194;
+	// <I43> =   195;
+	// <I44> =   196;
+	// <I45> =   197;
+	// <I46> =   198;	<K67>
+	// <I47> =   199;	<K68>
+	// <I48> =   200;	<K69>
+	// <I49> =   201;	<K6A>
+	// <I4A> =   202;
+	// <I4B> =   203;	<K6B>
+	// <I4C> =   204;	<K6C>
+	// <I4D> =   205;	<K6D>
+	// <I4E> =   206;	<K6E>
+	// <I4F> =   207;	<K6F>
+	// <I50> =   208;	<K70>
+	// <I51> =   209;	<K71>
+	// <I52> =   210;	<K72>
+	// <I53> =   211;	<K73>
+	// <I54> =   212;
+	// <I55> =   213;
+	// <I56> =   214;
+	// <I57> =   215;
+	// <I58> =   216;
+	// <I59> =   217;
+	// <I5A> =   218;
+	// <I5B> =   219;	<K74>
+	// <I5C> =   220;	<K75>
+	// <I5D> =   221;	<K76>
+	// <I5E> =   222;
+	// <I5F> =   223;
+	// <I60> =   224;
+	// <I61> =   225;
+	// <I62> =   226;
+	// <I63> =   227;
+	// <I64> =   228;
+	// <I65> =   229;
+	// <I66> =   230;
+	// <I67> =   231;
+	// <I68> =   232;
+	// <I69> =   233;
+	// <I6A> =   234;
+	// <I6B> =   235;
+	// <I6C> =   236;
+	// <I6D> =   237;
+	// <I6E> =   238;
+	// <I6F> =   239;
+	// <I70> =   240;
+	// <I71> =   241;
+	// <I72> =   242;
+	// <I73> =   243;
+	// <I74> =   244;
+	// <I75> =   245;
+	// <I76> =   246;
+	// <I77> =   247;
+	// <I78> =   248;
+	// <I79> =   249;
+	// <I7A> =   250;
+	// <I7B> =   251;
+	// <I7C> =   252;
+	// <I7D> =   253;
+	// <I7E> =   254;
+	// <I7F> =   255;
+
+	// Codes generated for scancodes 0x59-0x5f, 0x62-0x76
+	// <K59> =   157;		// <I1D>
+	// <K5A> =   170;		// <I2A>
+	// <K5B> =   181;		// <I35>
+	// alias <K5C> = <KPEQ>;
+	// <K5D> =   182;		// <I36>
+	// <K5E> =   183;		// <I37>
+	// <K5F> =   184;		// <I38>
+	// <K62> =   189;		// <I3D>
+	// <K63> =   190;		// <I3E>
+	// <K64> =   191;		// <I3F>
+	// <K65> =   192;		// <I40>
+	// <K66> =   193;		// <I41>
+	// <K67> =   198;		// <I46>
+	// <K68> =   199;		// <I47>
+	// <K69> =   200;		// <I48>
+	// <K6A> =   201;		// <I49>
+	// <K6B> =   203;		// <I4B>
+	// <K6C> =   204;		// <I4C>
+	// <K6D> =   205;		// <I4D>
+	// <K6E> =   206;		// <I4E>
+	// <K6F> =   207;		// <I4F>
+	// alias <K70> = <HKTG>;	// <I50>
+	// <K71> =   209;		// <I51>
+	// <K72> =   210;		// <I52>
+	// alias <K73> = <AB11>;	// <I53>
+	// <K74> =   219;		// <I5B>
+	// <K75> =   220;		// <I5C>
+	// <K76> =   221;		// <I5D>
+
+	// Solaris compatibility
+
+	// alias <LMTA> = <LWIN>;
+	// alias <RMTA> = <RWIN>;
+	// alias <COMP> = <MENU>;
+	// alias <POWR> = <I0C>;
+	// alias <MUTE> = <I0D>;
+	// alias <VOL-> = <I0E>;
+	// alias <VOL+> = <I0F>;
+	// alias <HELP> = <I10>;
+	// alias <STOP> = <I11>;
+	// alias <AGAI> = <I12>;
+	// alias <PROP> = <I13>;
+	// alias <UNDO> = <I14>;
+	// alias <FRNT> = <I15>;
+	// alias <COPY> = <I16>;
+	// alias <OPEN> = <I17>;
+	// alias <PAST> = <I18>;
+	// alias <FIND> = <I19>;
+	// alias <CUT>  = <I1A>;
+
+	// Other codes never generated.  The XFree86 ddx never generates
+	// these codes.
+	// Thus we can use them as fake keys
+	// <MDSW> =    93; // <U5D>
+	// <LVL3> =   124; // <U7C>
+	// <ALT>  =   125; // <U7D>
+	// <META> =   156; // <I1C>
+	// <SUPR> =   127; // <U7F>
+	// <HYPR> =   128; // <U80>
+
+	indicator 1 = "Caps Lock";
+	indicator 2 = "Num Lock";
+	indicator 3 = "Scroll Lock";
+
+	alias <ALGR> = <RALT>;
+};
diff -uNr xc/programs/xkbcomp/keycodes/Imakefile xc-new/programs/xkbcomp/keycodes/Imakefile
--- xc/programs/xkbcomp/keycodes/Imakefile	2004-04-23 23:54:51.000000000 +0400
+++ xc-new/programs/xkbcomp/keycodes/Imakefile	2006-01-23 03:21:12.000000000 +0300
@@ -8,7 +8,7 @@
 #define IHaveSubdirs
 
     DATAFILES = README amiga ataritt fujitsu hp ibm macintosh sony sun \
-		xfree86 xfree98 powerpcps2 aliases
+		xfree86 xfree98 powerpcps2 aliases evdev
       SUBDIRS = digital sgi
 
 all::
diff -uNr xc/programs/xkbcomp/keymap/evdev xc-new/programs/xkbcomp/keymap/evdev
--- xc/programs/xkbcomp/keymap/evdev	1970-01-01 03:00:00.000000000 +0300
+++ xc-new/programs/xkbcomp/keymap/evdev	2006-01-23 03:21:12.000000000 +0300
@@ -0,0 +1,362 @@
+// $XFree86: xc/programs/xkbcomp/keymap/evdev,v 3.30 2003/04/03 16:34:49 dawes Exp $
+
+
+default xkb_keymap "us" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc105)"		};
+    xkb_geometry	{ include "pc"			};
+};
+
+// "ar" addition by Arabeyes Team, <support@arabeyes.org>
+xkb_keymap "ar" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+ar"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "be"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+be"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "bg"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+bg"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
+xkb_keymap "br"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc101)+br"	};
+    xkb_geometry 	{ include "pc(abnt2)"		};
+};
+// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
+// are designed to replace old czechoslovakian and czsk keyboards
+// and their prog variants. Those are now obsolete and should not be used anymore.
+xkb_keymap "cz" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+cz"	};
+    xkb_geometry	{ include "pc"			};
+};
+xkb_keymap "cz_qwerty" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+cz_qwerty"	};
+    xkb_geometry	{ include "pc"			};
+};
+xkb_keymap "de"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+de"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "de_CH"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+de_CH"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "dk"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+dk"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "dvorak" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+dvorak"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "en_US" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc105)"	};
+    xkb_geometry 	{ include "pc"			};
+};
+xkb_keymap "es"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+es"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "fr"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+fr"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "fr-latin9" {
+    xkb_keycodes        { include "evdev"             };
+    xkb_types           { include "default"             };
+    xkb_compatibility   { include "default"             };
+    xkb_symbols         { include "en_US(pc105)+fr-latin9" };
+    xkb_geometry        { include "pc"           	};
+};
+xkb_keymap "fr_CA"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+ca"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "fr_CH"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+fr_CH"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "gb"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+gb"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "hr"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+hr"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "it"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+it"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "jp106" {
+    xkb_keycodes	{ include "evdev(jp106)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "jp(jp106)"		};
+    xkb_geometry	{ include "pc(jp106)"		};
+};
+xkb_keymap "lt"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+lt"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "lt_std"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+lt_std"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "lv"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+lv"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "mk" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+mk"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "mt" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+mt"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "mt_us" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+mt_us"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "no"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+no"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "pl"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+pl"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "pt"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+pt"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+// ro: additions by Cristian Gafton, <gafton@redhat.com>
+xkb_keymap "ro" {
+    xkb_keycodes	{ include "evdev"			};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols		{ include "en_US(pc101)+ro(pc101)"	};
+    xkb_geometry	{ include "pc(pc101)"			};
+};
+xkb_keymap "ro_microsoft" {
+    xkb_keycodes	{ include "evdev"			};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols		{ include "en_US(pc105)+ro(pc105)"	};
+    xkb_geometry	{ include "pc(pc105)"			};
+};
+xkb_keymap "ru"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+ru"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "se_FI"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+fi"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "se_SE"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+se"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "sl" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+si"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "sl_SI" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+si"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
+// are designed to replace old czechoslovakian and czsk keyboards
+// and their prog variants. Those are now obsolete and should not be used anymore.
+xkb_keymap "sk" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+sk"	};
+    xkb_geometry	{ include "pc"			};
+};
+xkb_keymap "sk_qwerty" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+sk_qwerty"	};
+    xkb_geometry	{ include "pc"			};
+};
+// Additions by Emil Soleyman-Zomalan, <emil@nishra.com>
+xkb_keymap "syr" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default" 		};
+    xkb_symbols		{ include "en_US(pc105)+syr"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};    
+xkb_keymap "th"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+th"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "th_tis"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+th_tis"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "th_pat"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+th_pat"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "tr" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+tr"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "uk" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+uk)"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "us_flexpro" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc105)"		};
+    xkb_geometry	{ include "keytronic(FlexPro)"	};
+};
+// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
+// us_intl means standard us keyboard plus dead_keys symbols
+// these keyboards are very popular in Brazil
+xkb_keymap "us_intl" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc101)+us_intl"	};
+    xkb_geometry	{ include "pc"			};
+};
+xkb_keymap "us_microsoft" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc105)"		};
+    xkb_geometry	{ include "microsoft"		};
+};
+
+xkb_keymap "uz" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+uz"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+
diff -uNr xc/programs/xkbcomp/keymap/Imakefile xc-new/programs/xkbcomp/keymap/Imakefile
--- xc/programs/xkbcomp/keymap/Imakefile	2004-04-23 23:54:52.000000000 +0400
+++ xc-new/programs/xkbcomp/keymap/Imakefile	2006-01-23 03:21:12.000000000 +0300
@@ -7,7 +7,7 @@
 
 #define IHaveSubdirs
 
-     DATAFILES = README amiga ataritt macintosh sony xfree86 xfree98
+     DATAFILES = README amiga ataritt macintosh sony xfree86 xfree98 evdev
        SUBDIRS = digital sgi sun
 
 all::
diff -uNr xc/programs/xkbcomp/rules/xorg xc-new/programs/xkbcomp/rules/xorg
--- xc/programs/xkbcomp/rules/xorg	2005-08-12 14:50:44.000000000 +0400
+++ xc-new/programs/xkbcomp/rules/xorg	2006-01-23 03:21:12.000000000 +0300
@@ -52,6 +52,7 @@
   pc98		=	xfree98(pc98)
   abnt2		=	xfree86(abnt2)
   jp106		=	xfree86(jp106)
+  evdev         =       evdev
   *		=	xfree86
 
 ! layout[1]	=	keycodes
diff -uNr xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c xc-new/programs/Xserver/hw/xfree86/input/evdev/evdev.c
--- xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c	2005-09-24 02:32:23.000000000 +0400
+++ xc-new/programs/Xserver/hw/xfree86/input/evdev/evdev.c	2006-01-23 20:10:08.000000000 +0300
@@ -47,6 +47,12 @@
 #include <exevents.h>
 #include <mipointer.h>
 
+#ifdef XKB
+#include <X11/extensions/XKB.h>
+#include <X11/extensions/XKBstr.h>
+#include <X11/extensions/XKBsrv.h>
+#endif
+
 #include <xf86Module.h>
 
 /* 2.4 compatibility */
@@ -81,8 +87,77 @@
 
 typedef struct {
     int kernel24;
+    int     noXkb;
+
+    /* XKB stuff has to be per-device rather than per-driver */
+#ifdef XKB
+    char                    *xkb_rules;
+    char                    *xkb_model;
+    char                    *xkb_layout;
+    char                    *xkb_variant;
+    char                    *xkb_options;
+    XkbComponentNamesRec    xkbnames;
+#endif
 } EvdevRec, *EvdevPtr;
 
+typedef enum {
+    OPTION_XKB_DISABLE,
+    OPTION_XKB_KEYMAP,
+    OPTION_XKB_KEYCODES,
+    OPTION_XKB_TYPES,
+    OPTION_XKB_COMPAT,
+    OPTION_XKB_SYMBOLS,
+    OPTION_XKB_GEOMETRY,
+    OPTION_XKB_RULES,
+    OPTION_XKB_MODEL,
+    OPTION_XKB_LAYOUT,
+    OPTION_XKB_VARIANT,
+    OPTION_XKB_OPTIONS
+} EvdevOpts;
+
+#ifdef XFree86LOADER
+static const OptionInfoRec EvdevOptions[] = {
+    { OPTION_XKB_DISABLE,   "XkbDisable",   OPTV_BOOLEAN, {0}, FALSE },
+    { OPTION_XKB_KEYMAP,    "XkbKeymap",    OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_KEYCODES,  "XkbKeycodes",  OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_TYPES,     "XkbTypes",     OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_COMPAT,    "XkbCompat",    OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_SYMBOLS,   "XkbSymbols",   OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_GEOMETRY,  "XkbGeometry",  OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_RULES,     "XkbRules",     OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_MODEL,     "XkbModel",     OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_LAYOUT,    "XkbLayout",    OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_VARIANT,   "XkbVariant",   OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_OPTIONS,   "XkbOptions",   OPTV_STRING,  {0}, FALSE },
+    { -1,                   NULL,           OPTV_NONE,    {0}, FALSE }
+};
+#endif
+
+static const char *evdevDefaults[] = {
+    "XkbRules",     "xfree86",
+    "XkbModel",     "evdev",
+    "XkbLayout",    "us",
+    NULL
+};
+
+static void
+SetXkbOption(InputInfoPtr pInfo, char *name, char **option)
+{
+    char *s;
+
+    if ((s = xf86SetStrOption(pInfo->options, name, NULL))) {
+        if (!s[0]) {
+            xfree(s);
+            *option = NULL;
+        } else {
+            *option = s;
+            xf86Msg(X_CONFIG, "%s: %s: \"%s\"\n", pInfo->name, name, s);
+        }
+    }
+}
+
+#define GET_EVDEVPTR(x) (x->public.devicePrivate->private)
+
 static int wheel_up_button = 4;
 static int wheel_down_button = 5;
 static int wheel_left_button = 6;
@@ -383,6 +458,7 @@
     CARD8 modMap[MAP_LENGTH];
     KeySym sym;
     int i, j;
+    EvdevPtr pEvdev;
 
     static struct { KeySym keysym; CARD8 mask; } modifiers[] = {
         { XK_Shift_L,		ShiftMask },
@@ -404,6 +480,7 @@
      */
 
     pInfo = device->public.devicePrivate;
+    pEvdev = pInfo->private;
 
      /* Compute the modifier map */
     memset(modMap, 0, sizeof modMap);
@@ -421,14 +498,41 @@
     keySyms.minKeyCode = MIN_KEYCODE;
     keySyms.maxKeyCode = MIN_KEYCODE + ArrayLength(map) / GLYPHS_PER_KEY - 1;
 
-    if (!InitKeyClassDeviceStruct(device, &keySyms, modMap))
-        return !Success;
-
-    if (!InitFocusClassDeviceStruct(device))
-        return !Success;
-
-    if (!InitKbdFeedbackClassDeviceStruct(device, EvdevKbdBell, EvdevKbdCtrl))
-        return !Success;
+#ifdef XKB
+    if (pEvdev->noXkb)
+#endif
+    {
+        xf86Msg(X_CONFIG, "XKB: disabled\n");
+        if (!InitKeyboardDeviceStruct((DevicePtr)device, &keySyms, modMap,
+                                      EvdevKbdBell, EvdevKbdCtrl))
+            return !Success;
+    }
+#ifdef XKB
+    else
+    {
+        SetXkbOption(pInfo, "XkbRules", &pEvdev->xkb_rules);
+        SetXkbOption(pInfo, "XkbModel", &pEvdev->xkb_model);
+        SetXkbOption(pInfo, "XkbLayout", &pEvdev->xkb_layout);
+        SetXkbOption(pInfo, "XkbVariant", &pEvdev->xkb_variant);
+        SetXkbOption(pInfo, "XkbOptions", &pEvdev->xkb_options);
+        SetXkbOption(pInfo, "XkbKeycodes", &pEvdev->xkbnames.keycodes);
+        SetXkbOption(pInfo, "XkbTypes", &pEvdev->xkbnames.types);
+        SetXkbOption(pInfo, "XkbCompat", &pEvdev->xkbnames.compat);
+        SetXkbOption(pInfo, "XkbSymbols", &pEvdev->xkbnames.symbols);
+        SetXkbOption(pInfo, "XkbGeometry", &pEvdev->xkbnames.geometry);
+
+        if (pEvdev->xkbnames.keymap)
+            pEvdev->xkb_rules = NULL;
+
+        XkbSetRulesDflts(pEvdev->xkb_rules, pEvdev->xkb_model,
+                         pEvdev->xkb_layout, pEvdev->xkb_variant,
+                         pEvdev->xkb_options);
+        if (!XkbInitKeyboardDeviceStruct(device, &pEvdev->xkbnames,
+                                         &keySyms, modMap, EvdevKbdBell,
+                                         EvdevKbdCtrl))
+            return !Success;
+    }
+#endif
 
     pInfo->flags |= XI86_KEYBOARD_CAPABLE;
 
@@ -673,7 +777,12 @@
         return pInfo;
     pInfo->private = pEvdev;
 
-    xf86CollectInputOptions(pInfo, NULL, NULL);
+    if (!(pEvdev = xcalloc(sizeof(EvdevRec), 1)))
+        return pInfo;
+
+    pInfo->private = pEvdev;
+
+    xf86CollectInputOptions(pInfo, evdevDefaults, NULL);
     xf86ProcessCommonOptions(pInfo, pInfo->options); 
 
     device = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
@@ -695,6 +804,9 @@
         return pInfo;
     }
 
+    pEvdev->noXkb = noXkbExtension;
+    /* parse the XKB options during kbd setup */
+
     if (EvdevProbe(pInfo))
         xfree(pEvdev);