diff --git a/ChangeLog b/ChangeLog
index dd2235b82..3ea4320d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
 	* xkb/xkbconfig.c:
 	* xkb/ddxConfig.c:
 	* xkb/xkbInit.c:
+	* hw/xgl/glx/xglx.c:
+	* hw/xnest/Keyboard.c:
 	Remove weirdo XkbCF pre-configuration code.
 
 	* xkb/xkb.h:
diff --git a/hw/xgl/glx/xglx.c b/hw/xgl/glx/xglx.c
index cff3821dd..f4ed2b731 100644
--- a/hw/xgl/glx/xglx.c
+++ b/hw/xgl/glx/xglx.c
@@ -1195,27 +1195,6 @@ xglxKeybdProc (DeviceIntPtr pDevice,
 		      names.keymap = XkbInitialMap;
 	      }
 
-	      file = fopen (XKB_BASE_DIRECTORY XKB_CONFIG_FILE, "r");
-	      if (file)
-	      {
-		  XkbConfigRtrnRec config;
-
-		  if (XkbCFParse (file, XkbCFDflts, desc, &config))
-		  {
-		      if (config.rules_file)
-			  rules = config.rules_file;
-		      if (config.model)
-			  model = config.model;
-		      if (config.layout)
-			  layout = config.layout;
-		      if (config.variant)
-			  variants = config.variant;
-		      if (config.options)
-			  options = config.options;
-		  }
-		  fclose (file);
-	      }
-
 	      XkbSetRulesDflts (rules, model, layout, variants, options);
 
 	      ret = XkbInitKeyboardDeviceStruct ((pointer) pDev,
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 52c5e91fe..4e82c6ed0 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: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.4 2005/06/25 21:28:48 ajax Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xnest/Keyboard.c,v 1.8 2005/07/14 03:36:44 kem Exp $ */
 /*
 
 Copyright 1993 by Davor Matic
@@ -235,26 +235,6 @@ XkbError:
 	    names.keymap = XkbInitialMap;
 	}
 
-	if ((file = fopen(XKB_BASE_DIRECTORY XKB_CONFIG_FILE, "r")) != NULL) {
-	  if (XkbCFParse(file, XkbCFDflts, xkb, &config) == 0) {
-	    ErrorF("Error parsing config file.\n");
-	    fclose(file);
-	    goto XkbError;
-	  }
-	  if (config.rules_file)
-	    rules = config.rules_file;
-	  if (config.model)
-	    model = config.model;
-	  if (config.layout)
-	    layout = config.layout;
-	  if (config.variant)
-	    variants = config.variant;
-	  if (config.options)
-	    options = config.options;
-
-	  fclose(file);
-	}
-
 	XkbSetRulesDflts(rules, model, layout, variants, options);
 	XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, modmap,
 				    xnestBell, xnestChangeKeyboardControl);