diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h
index 6c5b437d1..6cbdc5e30 100644
--- a/hw/xfree86/utils/xorgcfg/config.h
+++ b/hw/xfree86/utils/xorgcfg/config.h
@@ -29,6 +29,10 @@
  * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.21 2004/02/13 23:58:52 dawes Exp $
  */
 
+#ifdef HAVE_CONFIG_H
+# include "xorg-config.h"
+#endif
+
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/Xmu/SysUtil.h>
diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c
index f3be79324..0bc6a5dd9 100644
--- a/hw/xfree86/utils/xorgcfg/interface.c
+++ b/hw/xfree86/utils/xorgcfg/interface.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: $ */
 /*
  * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
  * 
@@ -528,18 +529,13 @@ main(int argc, char *argv[])
 
     if (!config_set && startedx) {
 	XtFree(XF86Config_path);
-#ifdef XF86CONFIG
-# ifdef XF86CONFIGDIR
+#ifndef XF86CONFIG
+# define XF86CONFIG __XCONFIGFILE__
+#endif
+#ifdef XF86CONFIGDIR
 	XF86Config_path = XtNewString(XF86CONFIGDIR "/" XF86CONFIG);
-# else
-	XF86Config_path = XtNewString("/etc/X11/" XF86CONFIG);
-# endif
 #else
-# ifdef XF86CONFIGDIR
-	XF86Config_path = XtNewString(XF86CONFIGDIR "/"__XCONFIGFILE__);
-# else
-	XF86Config_path = XtNewString("/etc/X11/"__XCONFIGFILE__);
-# endif
+	XF86Config_path = XtNewString("/etc/X11/" XF86CONFIG);
 #endif
     }
     XtAppMainLoop(appcon);
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c
index 24af9890c..db8b51bd8 100644
--- a/hw/xfree86/utils/xorgconfig/xorgconfig.c
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c
@@ -96,6 +96,11 @@
 /* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */
 /* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c,v 1.14 2005/05/28 00:08:03 alanc Exp $ */
 
+#ifdef HAVE_CONFIG_H
+# include "xorg-server.h"
+# include "xkb-config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -176,7 +181,7 @@ static int getuid() { return 0; }
 #endif
 
 #ifndef XCONFIGFILE
-#define XCONFIGFILE		"XF86Config"
+#define XCONFIGFILE		"xorg.conf"
 #endif
 #define CONFIGNAME		XCONFIGFILE
 
@@ -728,6 +733,10 @@ keyboard_configuration(void)
 	}
 #endif
 
+#ifndef XKB_RULES_DIR
+# define XKB_RULES_DIR XKB_BASE_DIRECTORY "/rules"
+#endif
+	
 #ifdef XFREE98_XKB
 	config_xkbrules = "xfree98";	/* static */
         rulesfile = XKB_RULES_DIR "/xfree98";