diff -Naur xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
--- xc.orig/config/cf/Imake.tmpl	2005-11-08 06:33:24.000000000 +0000
+++ xc/config/cf/Imake.tmpl	2005-12-28 22:38:33.000000000 +0000
@@ -963,6 +963,21 @@
 #endif
 #endif
 
+#ifndef IconDir
+# if NothingOutsideProjectRoot != YES
+#  define IconDir       /usr/share/cursors/xorg-x11
+#  ifndef XcursorPath
+#   define XcursorPath "~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/share/cursors/xorg-x11:/usr/share/pixmaps/xorg-x11"
+#  endif
+# else
+#  define IconDir       Concat(ProjectRoot,/lib/X11/icons)
+# endif
+#endif
+ 
+#ifndef XcursorPath
+# define XcursorPath Concat(~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/share/cursors/xorg-x11:/usr/share/pixmaps/xorg-x11:,IconDir)
+#endif
+
 #ifndef LogDirectory
 #if HasVarDirectory
 #define LogDirectory $(VARDIR)/log
@@ -1767,6 +1782,8 @@
        FILEMANDIR = FileManDir		/* man pages for config files */
        MISCMANDIR = MiscManDir		/* man pages for miscellaneous files */
      DRIVERMANDIR = DriverManDir	/* man pages for drivers */
+          ICONDIR = IconDir		/* Xcursor cursors/icon directory */
+      XCURSORPATH = XcursorPath		/* Xcursor cursors path */
      LOGDIRECTORY = LogDirectory	/* OS location of log files */
 #ifdef VarRunDirectory
         VARRUNDIR = VarRunDirectory	/* OS location of PID files */
diff -Naur xc.orig/lib/Xcursor/Imakefile xc/lib/Xcursor/Imakefile
--- xc.orig/lib/Xcursor/Imakefile	2005-10-09 21:52:42.000000000 +0000
+++ xc/lib/Xcursor/Imakefile	2005-12-28 22:39:49.000000000 +0000
@@ -48,9 +48,10 @@
 
 RPATH_CFLAG = HardCodeLibdirFlag
 
-ICONDIR=$(LIBDIR)/icons
+ICONDIRDEFS=-DICONDIR=\"$(ICONDIR)\"
+XCURSORPATHDEFS=-DXCURSORPATH=\"$(XCURSORPATH)\"
 
-DEFINES=-DICONDIR=\"$(ICONDIR)\" $(XFIXES_DEFINES)
+DEFINES=$(ICONDIRDEFS) $(XCURSORPATHDEFS)
 
 SRCS =	cursor.c display.c file.c library.c xlib.c
 
diff -Naur xc.orig/lib/Xcursor/library.c xc/lib/Xcursor/library.c
--- xc.orig/lib/Xcursor/library.c	2005-12-08 17:54:40.000000000 +0000
+++ xc/lib/Xcursor/library.c	2005-12-28 22:45:25.000000000 +0000
@@ -26,14 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef ICONDIR
-#define ICONDIR "/usr/X11R6/lib/X11/icons"
-#endif
-
-#ifndef XCURSORPATH
-#define XCURSORPATH "~/.icons:/usr/share/icons:/usr/share/pixmaps:"ICONDIR
-#endif
-
 const char *
 XcursorLibraryPath (void)
 {
diff -Naur xc.orig/programs/xcursorgen/Imakefile xc/programs/xcursorgen/Imakefile
--- xc.orig/programs/xcursorgen/Imakefile	2005-11-08 06:33:31.000000000 +0000
+++ xc/programs/xcursorgen/Imakefile	2005-12-28 22:38:35.000000000 +0000
@@ -4,7 +4,6 @@
 
         SUBDIRS = redglass whiteglass handhelds
   DEFAULT_THEME = DefaultCursorTheme
-        ICONDIR = $(LIBDIR)/icons
        THEMEDIR = $(ICONDIR)/default
        INCLUDES = $(LIBPNGINC)
         DEPLIBS = $(DEPXLIB)
diff -Naur xc.orig/programs/xcursorgen/handhelds/Imakefile xc/programs/xcursorgen/handhelds/Imakefile
--- xc.orig/programs/xcursorgen/handhelds/Imakefile	2004-04-23 19:54:41.000000000 +0000
+++ xc/programs/xcursorgen/handhelds/Imakefile	2005-12-28 22:38:36.000000000 +0000
@@ -2,7 +2,6 @@
 
 #define CursorSources(name) $(PNGDIR)/name-16.png
 
-ICONDIR=$(LIBDIR)/icons
 THEME=handhelds
 PNGDIR=../redglass
 THEMEDIR=$(ICONDIR)/$(THEME)/cursors
diff -Naur xc.orig/programs/xcursorgen/redglass/Imakefile xc/programs/xcursorgen/redglass/Imakefile
--- xc.orig/programs/xcursorgen/redglass/Imakefile	2004-04-23 19:54:42.000000000 +0000
+++ xc/programs/xcursorgen/redglass/Imakefile	2005-12-28 22:38:38.000000000 +0000
@@ -17,8 +17,6 @@
               hourglass-full-24.png hourglass-full-32.png hourglass-full-48.png \
               hourglass-full-64.png
 
-
-ICONDIR=$(LIBDIR)/icons
 THEME=redglass
 THEMEDIR=$(ICONDIR)/$(THEME)/cursors
 
diff -Naur xc.orig/programs/xcursorgen/whiteglass/Imakefile xc/programs/xcursorgen/whiteglass/Imakefile
--- xc.orig/programs/xcursorgen/whiteglass/Imakefile	2004-04-23 19:54:42.000000000 +0000
+++ xc/programs/xcursorgen/whiteglass/Imakefile	2005-12-28 22:38:39.000000000 +0000
@@ -2,7 +2,6 @@
 
 #define CursorSources(name) name-16.png name-24.png name-32.png name-48.png name-64.png
 
-ICONDIR=$(LIBDIR)/icons
 THEME=whiteglass
 THEMEDIR=$(ICONDIR)/$(THEME)/cursors