diff --git a/ChangeLog b/ChangeLog
index 4d33fbe2b..ddd0b5dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,20 @@
 	* xkb/ddxVT.c:
 	Minor #include cleanups.
 
+	* xkb/xkb.c:
+	* xkb/xkbUtils.c:
+	* hw/xfree86/common/xf86Config.c:
+	* hw/xfree86/common/xf86Io.c:
+	* hw/xfree86/os-support/sysv/xqueue.c:
+	* hw/xnest/Keyboard.c:
+	* hw/kdrive/src/kinput.c:
+	* hw/xgl/egl/kinput.c:
+	* hw/dmx/input/dmxinputinit.c:
+	* hw/xgl/glx/xglx.c:
+	* hw/xwin/winconfig.c:
+	* hw/xwin/winkeybd.c:
+	Remove -xkbmap argument.
+
 2006-05-26  Matthieu Herrb <matthieu.herrb@laas.fr>
 
 	* hw/xfree86/os-support/bsd/bsd_mouse.c:
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c
index c81eb846f..57eb5751c 100644
--- a/hw/dmx/input/dmxinputinit.c
+++ b/hw/dmx/input/dmxinputinit.c
@@ -356,55 +356,41 @@ static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info)
                          dmxConfigGetXkbLayout(),
                          dmxConfigGetXkbVariant(),
                          dmxConfigGetXkbOptions());
-        if (XkbInitialMap) {    /* Set with -xkbmap */
-            dmxLogInput(dmxInput,
-                        "XKEYBOARD: From command line: %s\n", XkbInitialMap);
-            if ((info->names.keymap = strchr(XkbInitialMap, '/')))
-                ++info->names.keymap;
-            else
-                info->names.keymap = XkbInitialMap;
-            info->names.keycodes   = NULL;
-            info->names.types      = NULL;
-            info->names.compat     = NULL;
-            info->names.symbols    = NULL;
-            info->names.geometry   = NULL;
+        if (!info->force && (dmxInput->keycodes
+                             || dmxInput->symbols
+                             || dmxInput->geometry)) {
+            if (info->freenames) dmxKeyboardFreeNames(&info->names);
+            info->freenames      = 0;
+            info->names.keycodes = dmxInput->keycodes;
+            info->names.types    = NULL;
+            info->names.compat   = NULL;
+            info->names.symbols  = dmxInput->symbols;
+            info->names.geometry = dmxInput->geometry;
+            
+            dmxLogInput(dmxInput, "XKEYBOARD: From command line: %s",
+                        info->names.keycodes);
+            if (info->names.symbols && *info->names.symbols)
+                dmxLogInputCont(dmxInput, " %s", info->names.symbols);
+            if (info->names.geometry && *info->names.geometry)
+                dmxLogInputCont(dmxInput, " %s", info->names.geometry);
+            dmxLogInputCont(dmxInput, "\n");
+        } else if (info->names.keycodes) {
+            dmxLogInput(dmxInput, "XKEYBOARD: From device: %s",
+                        info->names.keycodes);
+            if (info->names.symbols && *info->names.symbols)
+                dmxLogInputCont(dmxInput, " %s", info->names.symbols);
+            if (info->names.geometry && *info->names.geometry)
+                dmxLogInputCont(dmxInput, " %s", info->names.geometry);
+            dmxLogInputCont(dmxInput, "\n");
         } else {
-            if (!info->force && (dmxInput->keycodes
-                                 || dmxInput->symbols
-                                 || dmxInput->geometry)) {
-                if (info->freenames) dmxKeyboardFreeNames(&info->names);
-                info->freenames      = 0;
-                info->names.keycodes = dmxInput->keycodes;
-                info->names.types    = NULL;
-                info->names.compat   = NULL;
-                info->names.symbols  = dmxInput->symbols;
-                info->names.geometry = dmxInput->geometry;
-                
-                dmxLogInput(dmxInput, "XKEYBOARD: From command line: %s",
-                            info->names.keycodes);
-                if (info->names.symbols && *info->names.symbols)
-                    dmxLogInputCont(dmxInput, " %s", info->names.symbols);
-                if (info->names.geometry && *info->names.geometry)
-                    dmxLogInputCont(dmxInput, " %s", info->names.geometry);
-                dmxLogInputCont(dmxInput, "\n");
-            } else if (info->names.keycodes) {
-                dmxLogInput(dmxInput, "XKEYBOARD: From device: %s",
-                            info->names.keycodes);
-                if (info->names.symbols && *info->names.symbols)
-                    dmxLogInputCont(dmxInput, " %s", info->names.symbols);
-                if (info->names.geometry && *info->names.geometry)
-                    dmxLogInputCont(dmxInput, " %s", info->names.geometry);
-                dmxLogInputCont(dmxInput, "\n");
-            } else {
-                dmxLogInput(dmxInput, "XKEYBOARD: Defaults: %s %s %s %s %s\n",
-                            dmxConfigGetXkbRules(),
-                            dmxConfigGetXkbLayout(),
-                            dmxConfigGetXkbModel(),
-                            dmxConfigGetXkbVariant()
-                            ? dmxConfigGetXkbVariant() : "",
-                            dmxConfigGetXkbOptions()
-                            ? dmxConfigGetXkbOptions() : "");
-            }
+            dmxLogInput(dmxInput, "XKEYBOARD: Defaults: %s %s %s %s %s\n",
+                        dmxConfigGetXkbRules(),
+                        dmxConfigGetXkbLayout(),
+                        dmxConfigGetXkbModel(),
+                        dmxConfigGetXkbVariant()
+                        ? dmxConfigGetXkbVariant() : "",
+                        dmxConfigGetXkbOptions()
+                        ? dmxConfigGetXkbOptions() : "");
         }
         XkbInitKeyboardDeviceStruct(pDevice,
                                     &info->names,
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 1c77dd133..f671eb698 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -455,9 +455,6 @@ KdKeybdProc(DeviceIntPtr pDevice, int onoff)
 #else
 	memset(&names, 0, sizeof(XkbComponentNamesRec));
 
-	if (XkbInitialMap) 
-	    names.keymap = XkbInitialMap;
-
 	XkbSetRulesDflts ("base", "pc101", "us", NULL, NULL);
 	ret = XkbInitKeyboardDeviceStruct ((DeviceIntPtr) pDev,
 					   &names,
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 42e7d8746..180506b5d 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.28 2006/04/07 01:41:00 ajax Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.29 2006/05/25 23:32:33 reed Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */
 
 
@@ -1323,7 +1323,7 @@ configInputKbd(IDevPtr inputp)
 
 #define NULL_IF_EMPTY(s) (s[0] ? s : (xfree(s), (char *)NULL))
 
-  if (!noXkbExtension && !XkbInitialMap) {
+  if (!noXkbExtension) {
     if ((s = xf86SetStrOption(inputp->commonOptions, "XkbKeymap", NULL))) {
       xf86Info.xkbkeymap = NULL_IF_EMPTY(s);
       xf86Msg(X_CONFIG, "XKB: keymap: \"%s\" "
diff --git a/hw/xfree86/common/xf86Io.c b/hw/xfree86/common/xf86Io.c
index 4e1dc4b0f..4dbbd7e93 100644
--- a/hw/xfree86/common/xf86Io.c
+++ b/hw/xfree86/common/xf86Io.c
@@ -49,7 +49,7 @@
  */
 
 /* $XConsortium: xf86Io.c /main/27 1996/10/19 17:58:55 kaleb $ */
-/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Io.c,v 1.5 2005/07/03 07:01:24 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Io.c,v 1.6 2006/03/25 19:52:03 ajax Exp $ */
 
 #define NEED_EVENTS
 #ifdef HAVE_XORG_CONFIG_H
@@ -369,12 +369,6 @@ xf86KbdProc (pKeyboard, what)
 	XkbDescPtr		desc;
 	Bool			foundTerminate = FALSE;
 	int			keyc;
-	if (XkbInitialMap) {
-	    if ((xf86Info.xkbkeymap = strchr(XkbInitialMap, '/')) != NULL)
-		xf86Info.xkbkeymap++;
-	    else
-		xf86Info.xkbkeymap = XkbInitialMap;
-	}
 	if (xf86Info.xkbkeymap) {
 	    names.keymap = xf86Info.xkbkeymap;
 	    names.keycodes = NULL;
diff --git a/hw/xfree86/os-support/sysv/xqueue.c b/hw/xfree86/os-support/sysv/xqueue.c
index 6c2132cef..e9cab1588 100644
--- a/hw/xfree86/os-support/sysv/xqueue.c
+++ b/hw/xfree86/os-support/sysv/xqueue.c
@@ -135,12 +135,6 @@ xf86XqueKbdProc(DeviceIntPtr pKeyboard, int what)
 #ifdef XKB
     } else {
 	XkbComponentNamesRec names;
-	if (XkbInitialMap) {
-	    if ((xf86Info.xkbkeymap = strchr(XkbInitialMap, '/')) != NULL)
-		xf86Info.xkbkeymap++;
-	    else
-		xf86Info.xkbkeymap = XkbInitialMap;
-	}
 	if (xf86Info.xkbkeymap) {
 	    names.keymap = xf86Info.xkbkeymap;
 	    names.keycodes = NULL;
diff --git a/hw/xgl/egl/kinput.c b/hw/xgl/egl/kinput.c
index 90997d25e..b374bf580 100644
--- a/hw/xgl/egl/kinput.c
+++ b/hw/xgl/egl/kinput.c
@@ -454,9 +454,6 @@ KdKeybdProc(DeviceIntPtr pDevice, int onoff)
 #else
 	memset(&names, 0, sizeof(XkbComponentNamesRec));
 
-	if (XkbInitialMap)
-	    names.keymap = XkbInitialMap;
-
 	XkbSetRulesDflts ("base", "pc101", "us", NULL, NULL);
 	ret = XkbInitKeyboardDeviceStruct (pDev,
 					   &names,
diff --git a/hw/xgl/glx/xglx.c b/hw/xgl/glx/xglx.c
index f4ed2b731..1ded3e304 100644
--- a/hw/xgl/glx/xglx.c
+++ b/hw/xgl/glx/xglx.c
@@ -1187,14 +1187,6 @@ xglxKeybdProc (DeviceIntPtr pDevice,
 
 	      memset (&names, 0, sizeof (XkbComponentNamesRec));
 
-	      if (XkbInitialMap)
-	      {
-		  if ((names.keymap = strchr (XkbInitialMap, '/')) != NULL)
-		      names.keymap++;
-		  else
-		      names.keymap = XkbInitialMap;
-	      }
-
 	      XkbSetRulesDflts (rules, model, layout, variants, options);
 
 	      ret = XkbInitKeyboardDeviceStruct ((pointer) pDev,
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 4e82c6ed0..9b4f1a1ab 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -1,5 +1,5 @@
 /* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
-/* $XdotOrg: xserver/xorg/hw/xnest/Keyboard.c,v 1.8 2005/07/14 03:36:44 kem Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xnest/Keyboard.c,v 1.9 2006/03/27 22:25:56 daniels Exp $ */
 /*
 
 Copyright 1993 by Davor Matic
@@ -228,12 +228,6 @@ XkbError:
 	layout = XKB_DFLT_KB_LAYOUT;
 	variants = XKB_DFLT_KB_VARIANT;
 	options = XKB_DFLT_KB_OPTIONS;
-	if (XkbInitialMap) {
-	  if ((names.keymap = strchr(XkbInitialMap, '/')) != NULL)
-	    ++names.keymap;
-	  else
-	    names.keymap = XkbInitialMap;
-	}
 
 	XkbSetRulesDflts(rules, model, layout, variants, options);
 	XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, modmap,
diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c
index 917ce08c0..514dfdc84 100644
--- a/hw/xwin/winconfig.c
+++ b/hw/xwin/winconfig.c
@@ -542,16 +542,6 @@ winConfigKeyboard (DeviceIntPtr pDevice)
 
 #ifdef XWIN_XF86CONFIG
 	  from = X_CMDLINE;
-	  if (!XkbInitialMap)
-	    {
-	      s =
-		winSetStrOption (kbd->inp_option_lst, "XkbInitialMap", NULL);
-	      if (s)
-		{
-		  XkbInitialMap = NULL_IF_EMPTY (s);
-		  from = X_CONFIG;
-		}
-	    }
 
 	  if ((s = winSetStrOption (kbd->inp_option_lst, "XkbKeymap", NULL)))
 	    {
diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c
index 3756a4432..3161e1f82 100644
--- a/hw/xwin/winkeybd.c
+++ b/hw/xwin/winkeybd.c
@@ -259,24 +259,12 @@ winKeybdProc (DeviceIntPtr pDeviceInt, int iState)
       else 
 	{
 
-	  if (XkbInitialMap) 
-	    {
-	      names.keymap = XkbInitialMap;
-	      names.keycodes = NULL;
-	      names.types = NULL;
-	      names.compat = NULL;
-	      names.symbols = NULL;
-	      names.geometry = NULL;
-	    } 
-	  else 
-	    {
-	      names.keymap = g_winInfo.xkb.keymap;
-	      names.keycodes = g_winInfo.xkb.keycodes;
-	      names.types = g_winInfo.xkb.types;
-	      names.compat = g_winInfo.xkb.compat;
-	      names.symbols = g_winInfo.xkb.symbols;
-	      names.geometry = g_winInfo.xkb.geometry;
-	    }
+          names.keymap = g_winInfo.xkb.keymap;
+          names.keycodes = g_winInfo.xkb.keycodes;
+          names.types = g_winInfo.xkb.types;
+          names.compat = g_winInfo.xkb.compat;
+          names.symbols = g_winInfo.xkb.symbols;
+          names.geometry = g_winInfo.xkb.geometry;
 
 	  winErrorFVerb(2, "Rules = \"%s\" Model = \"%s\" Layout = \"%s\""
 		 " Variant = \"%s\" Options = \"%s\"\n",
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index ded506bc6..d2824da83 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -1,5 +1,5 @@
 /* $Xorg: xkbInit.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */
-/* $XdotOrg: xserver/xorg/xkb/xkbInit.c,v 1.12 2006/03/25 21:52:49 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/xkb/xkbInit.c,v 1.13 2006/03/25 22:35:48 daniels Exp $ */
 /************************************************************
 Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
 
@@ -127,7 +127,6 @@ typedef struct	_SrvXkmInfo {
 
 char	*		XkbBaseDirectory=	XKB_BASE_DIRECTORY;
 char	*		XkbBinDirectory=	XKB_BIN_DIRECTORY;
-char	*		XkbInitialMap=		NULL;
 int	 		XkbWantAccessX=		0;	
 static XkbFileInfo *	_XkbInitFileInfo=	NULL;
 
@@ -495,35 +494,6 @@ XkbEventCauseRec	cause;
     file.file=NULL;
     bzero(&file.xkbinfo,sizeof(XkbFileInfo));
     bzero(&changes,sizeof(XkbChangesRec));
-    if (XkbInitialMap!=NULL) {
-	if ((file.file=XkbDDXOpenConfigFile(XkbInitialMap,NULL,0))!=NULL) {
-	    XkmReadFile(file.file,0,XkmKeymapLegal,&file.xkbinfo);
-	    if (file.xkbinfo.xkb==NULL) {
-		LogMessage(X_ERROR,
-				"Error loading keymap file %s (%s in %s)\n"
-				"\treverting to defaults\n",
-				XkbInitialMap, _XkbErrMessages[_XkbErrCode],
-				(_XkbErrLocation?_XkbErrLocation:"unknown"));
-		fclose(file.file);
-		file.file= NULL;
-		bzero(&file.xkbinfo,sizeof(XkbFileInfo));
-	    }
-	    else {
-		if (_XkbInitFileInfo!=NULL) {
-		    XkbDescPtr	tmp;
-		    if ((tmp=_XkbInitFileInfo->xkb)!=NULL) {
-			XkbFreeKeyboard(tmp,XkbAllComponentsMask,True);
-			_XkbInitFileInfo->xkb= NULL;
-		    }
-		}
-		_XkbInitFileInfo= &file.xkbinfo;
-	    }
-	}
-	else {
-	    LogMessage(X_ERROR, "Error opening keymap file %s, reverting to defaults\n",
-	    	    XkbInitialMap);
-	}
-    }
     pXDev->key->xkbInfo= xkbi= _XkbTypedCalloc(1,XkbSrvInfoRec);
     if ( xkbi ) {
 	XkbDescPtr	xkb;
@@ -906,20 +876,6 @@ XkbProcessArguments(int argc,char *argv[],int i)
 	    return -1;
 	}
     }
-    else if (strncmp(argv[i], "-xkbmap", 7) == 0) {
-	if(++i < argc) {
-	    if (strlen(argv[i]) < PATH_MAX) {
-		XkbInitialMap= argv[i];
-		return 2;
-	    } else {
-		LogMessage(X_ERROR, "-xkbmap pathname too long\n");
-		return -1;
-	    }
-	}
-	else {
-	    return -1;
-	}
-    }
     else if ((strncmp(argv[i],"-accessx",8)==0)||
                  (strncmp(argv[i],"+accessx",8)==0)) {
 	int j=1;	    
@@ -982,5 +938,4 @@ XkbUseMsg(void)
     ErrorF("                       enable/disable accessx key sequences\n");
     ErrorF("-ardelay               set XKB autorepeat delay\n");
     ErrorF("-arinterval            set XKB autorepeat interval\n");
-    ErrorF("-xkbmap                XKB keyboard description to load on startup\n");
 }
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index e9e9c2636..4c0db6f2e 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -867,26 +867,6 @@ XkbDescPtr	xkb=	xkbi->desc;
     }
     if ((xkb->geom!=NULL)&&(xkb->geom->name==name))
 	return xkb->geom;
-    else if ((name==xkb->names->geometry)&&(xkb->geom==NULL)) {
-	FILE *file= XkbDDXOpenConfigFile(XkbInitialMap,NULL,0);
-	if (file!=NULL) {
-	    XkbFileInfo		xkbFInfo;
-	    xkmFileInfo		finfo;
-	    xkmSectionInfo	toc[MAX_TOC],*entry;
-	    bzero(&xkbFInfo,sizeof(xkbFInfo));
-	    xkbFInfo.xkb= xkb;
-	    if (XkmReadTOC(file,&finfo,MAX_TOC,toc)) {
-		entry= XkmFindTOCEntry(&finfo,toc,XkmGeometryIndex);
-		if (entry!=NULL)
-		    XkmReadFileSection(file,entry,&xkbFInfo,NULL);
-	    }
-	    fclose(file);
-	    if (xkb->geom) {
-		*shouldFree= 0;
-		return xkb->geom;
-	    }
-	}
-    }
     *shouldFree= 1;
     return NULL;
 }