-diff -urN xc.orig/programs/xinit/startx.cpp xc/programs/xinit/startx.cpp
---- xc.orig/programs/xinit/startx.cpp Mon Dec 30 15:54:10 2002
-+++ xc/programs/xinit/startx.cpp Mon Dec 30 17:31:52 2002
-@@ -53,7 +53,7 @@
- sysclientrc=XINITDIR/xinitrc
- sysserverrc=XINITDIR/xserverrc
- defaultclient=BINDIR/xterm
--defaultserver=BINDIR/X
-+defaultserver=BINDIR/Xwrapper
- defaultclientargs=""
- defaultserverargs=""
- clientargs=""
-diff -urN xc.orig/programs/xinit/xinit.c xc/programs/xinit/xinit.c
---- xc.orig/programs/xinit/xinit.c Mon Dec 30 15:54:10 2002
-+++ xc/programs/xinit/xinit.c Mon Dec 30 17:31:52 2002
-@@ -146,6 +146,7 @@
- #define OK_EXIT 0
- #define ERR_EXIT 1
-
-+char *default_wrapper = BINDIR "/Xwrapper";
- char *default_server = "X";
- char *default_display = ":0"; /* choose most efficient */
- char *default_client[] = {"xterm", "-geometry", "+1+1", "-n", "login", NULL};
-@@ -332,7 +333,10 @@
- if (argc == 0 ||
- #ifndef __UNIXOS2__
- (**argv != '/' && **argv != '.')) {
-- *sptr++ = default_server;
-+ if (access(default_wrapper, X_OK) == 0)
-+ *sptr++ = default_wrapper;
-+ else
-+ *sptr++ = default_server;
- #else
- (**argv != '/' && **argv != '\\' && **argv != '.' &&
- !(isalpha(**argv) && (*argv)[1]==':'))) {