+diff -ur X11-6.9.0.org/xc/config/cf/linux.cf X11-6.9.0/xc/config/cf/linux.cf
+--- X11-6.9.0.org/xc/config/cf/linux.cf 2005-10-21 21:10:27.000000000 +0200
++++ X11-6.9.0/xc/config/cf/linux.cf 2005-12-22 10:40:10.100963000 +0100
+@@ -394,7 +394,7 @@
+ #ifndef BuildLibGlxWithoutPIC
+ # if BuildXF86DRI
+ # if defined(i386Architecture)
+-# define BuildLibGlxWithoutPIC YES
++# define BuildLibGlxWithoutPIC NO
+ # endif
+ # endif
+ #endif
+@@ -539,6 +539,10 @@
+ # define HasExpat YES
+ #endif
+
++#ifndef HasFontconfig
++# define HasFontconfig YES
++#endif
++
+ #ifndef HasFreetype2
+ # define HasFreetype2 YES
+ #endif
+@@ -792,7 +796,7 @@
+
+ #define HasVarRun YES
+ #ifndef VarDbDirectory
+-# define VarDbDirectory $(VARDIR)/lib
++# define VarDbDirectory /var/lib
+ #endif
+
+ #ifndef XF86OSCardDrivers
+diff -ur X11-6.9.0.org/xc/config/cf/site.def X11-6.9.0/xc/config/cf/site.def
+--- X11-6.9.0.org/xc/config/cf/site.def 2004-05-06 17:08:25.000000000 +0200
++++ X11-6.9.0/xc/config/cf/site.def 2005-12-22 10:29:12.390963000 +0100
+@@ -124,6 +124,14 @@
+ #define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
+ */
+
++#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
++#undef DefaultSystemPath
++#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
++
++
++#define HasPam YES
++#define HasPamMisc YES
++
+
+ /* You do NOT need SetUID if you only run the server under xdm */
+ /* You MAY need SetUID if users run the server by hand or under xinit */
+diff -ur X11-6.9.0.org/xc/config/cf/X11.tmpl X11-6.9.0/xc/config/cf/X11.tmpl
+--- X11-6.9.0.org/xc/config/cf/X11.tmpl 2005-12-15 00:41:52.000000000 +0100
++++ X11-6.9.0/xc/config/cf/X11.tmpl 2005-12-22 10:32:25.830963000 +0100
+@@ -597,7 +597,7 @@
+ #define BuildXF86RushLibrary (BuildXF86RushExt && !BuildServersOnly)
+ #endif
+ #ifndef BuildDPSLibraries
+-#define BuildDPSLibraries NO
++#define BuildDPSLibraries YES
+ #endif
+ #ifndef BuildDPSLibrary
+ #define BuildDPSLibrary BuildDPSLibraries
+@@ -693,7 +693,7 @@
+ #endif
+
+ #ifndef BuildXterm
+-#define BuildXterm NO
++#define BuildXterm YES
+ #endif
+
+ #ifndef BuildXkbcomp
+@@ -731,7 +731,7 @@
+ #endif
+
+ #ifndef InstallHardcopyDocs
+-#define InstallHardcopyDocs YES
++#define InstallHardcopyDocs NO
+ #endif
+
+ #ifndef InstallMiscManPages
+@@ -1395,8 +1395,12 @@