--- man/xinit.man
+++ man/xinit.man
@@ -51,7 +51,7 @@
 .PP
 If no specific client program is given on the command line,
 \fBxinit\fP will look for a file in the user's home directory
-called \fI.xinitrc\fP to run as a shell script to start up client programs.
+called \fI.desk/xinitrc\fP to run as a shell script to start up client programs.
 If no such file exists, \fBxinit\fP will use the following as a default:
 .sp
 	xterm  \-geometry  +1+1  \-n  login  \-display  :0
@@ -74,7 +74,7 @@
 .sp
 	exec Xdisplaytype
 .PP
-An important point is that programs which are run by \fI\.xinitrc\fP
+An important point is that programs which are run by \fI\.desk/xinitrc\fP
 should be run in the background if they do
 not exit right away, so that they don't prevent other programs from
 starting up.
@@ -106,7 +106,7 @@
 used.
 .TP 8
 .B "xinit"
-This will start up a server named \fIX\fP and run the user's \fI\.xinitrc\fP,
+This will start up a server named \fIX\fP and run the user's \fI\.desk/xinitrc\fP,
 if it exists, or else start an \fIxterm\fP.
 .TP 8
 .B "xinit \-\^\- /usr/local/bin/Xvnc  :1"
@@ -114,7 +114,7 @@
 .TP 8
 .B "xinit \-geometry =80x65+10+10 \-fn 8x13 \-j \-fg white \-bg navy"
 This will start up a server named \fIX\fP, and will append the given
-arguments to the default \fIxterm\fP command.  It will ignore \fI\.xinitrc\fP.
+arguments to the default \fIxterm\fP command.  It will ignore \fI\.desk/xinitrc\fP.
 .TP 8
 .B "xinit \-e widgets \-\^\- ./Xorg \-l \-c"
 This will use the command \fI\.\/Xorg \-l \-c\fP to start the server and will
@@ -126,7 +126,7 @@
 \fBfasthost\fP in which it will run the command \fIcpupig\fP, telling it
 to display back on the local workstation.
 .PP
-Below is a sample \fI\.xinitrc\fP that starts a clock, several terminals, and
+Below is a sample \fI\.desk/xinitrc\fP that starts a clock, several terminals, and
 leaves the window manager running as the ``last'' application.  Assuming that
 the window manager has been configured properly, the user
 then chooses the ``Exit'' menu item to shut down X.
@@ -144,7 +144,7 @@
 .in -8
 .sp
 Sites that want to create a common startup environment could simply create
-a default \fI\.xinitrc\fP that references a site-wide startup file:
+a default \fI\.desk/xinitrc\fP that references a site-wide startup file:
 .sp
 .in +8
 .nf
@@ -173,15 +173,15 @@
 .TP 15
 .B XINITRC
 This variable specifies an init file containing shell commands to start up the
-initial windows.  By default, \fI\.xinitrc\fP in the home directory will be
+initial windows.  By default, \fI\.desk/xinitrc\fP in the home directory will be
 used.
 .SH FILES
 .TP 15
-.I .xinitrc
+.I .desk/xinitrc
 default client script
 .TP 15
 .I xterm
-client to run if \fI.xinitrc\fP does not exist
+client to run if \fI.desk/xinitrc\fP does not exist
 .TP 15
 .I .xserverrc
 default server script
--- xinit.c
+++ xinit.c
@@ -78,12 +78,12 @@
     NULL};
 
 #ifndef XINITRC
-#define XINITRC ".xinitrc"
+#define XINITRC ".desk/xinitrc"
 #endif
 char xinitrcbuf[256];
 
 #ifndef XSERVERRC
-#define XSERVERRC ".xserverrc"
+#define XSERVERRC ".desk/xserverrc"
 #endif
 char xserverrcbuf[256];
 
@@ -95,8 +95,8 @@
 static char *default_client[] = {"xterm", "-geometry", "+1+1", "-n", "login", NULL};
 static char *serverargv[100];
 static char *clientargv[100];
-static char **server = serverargv + 2;        /* make sure room for sh .xserverrc args */
-static char **client = clientargv + 2;        /* make sure room for sh .xinitrc args */
+static char **server = serverargv + 2;        /* make sure room for sh .desk/xserverrc args */
+static char **client = clientargv + 2;        /* make sure room for sh .desk/xinitrc args */
 static char *displayNum = NULL;
 static char *program = NULL;
 static Display *xd = NULL;            /* server connection */