diff -ur ./config/X11.tmpl ../work/config/X11.tmpl
--- ./config/X11.tmpl	2001-10-16 22:37:18.000000000 -0300
+++ ../work/config/X11.tmpl	2008-03-14 20:57:57.000000000 -0200
@@ -6,7 +6,7 @@
 #include "/usr/openwin/lib/config/Project.tmpl"
 #else	/* Sun & SVR4 */
 #if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || defined(BSD386Architecture)
-#include "/usr/X11R6/lib/X11/config/X11.tmpl"
+#include "/usr/lib/X11/config/X11.tmpl"
 #else	/* Linux || *BSD */
 #include "/usr/lib/X11/config/Project.tmpl"
 #endif	/* Linux || *BSD */
diff -ur ./Makefile.ini ../work/Makefile.ini
--- ./Makefile.ini	2001-10-16 22:37:18.000000000 -0300
+++ ../work/Makefile.ini	2008-03-14 20:57:45.000000000 -0200
@@ -13,9 +13,9 @@
                RM = rm -f
                MV = mv
              MAKE = make
-#       CONFIGSRC = /usr/lib/X11/config
+        CONFIGSRC = /usr/lib/X11/config
 #       CONFIGSRC = /usr/openwin/lib/X11/config
-        CONFIGSRC = /usr/X11R6/lib/X11/config
+#       CONFIGSRC = /usr/X11R6/lib/X11/config
          IMAKESRC = $(CONFIGSRC)
          IRULESRC = $(CONFIGSRC)
           WSFLAGS =