--- ./startx.cpp.00	2006-11-06 23:45:48.000000000 +0100
+++ ./startx.cpp	2011-02-26 17:43:02.000000000 +0100
@@ -190,10 +190,12 @@
 dummy=0
 
 XCOMM create a file with auth information for the server. ':0' is a dummy.
-xserverauthfile=$HOME/.serverauth.$$
+xserverauthfile=$HOME/.Xserverauth
+rm -f $xserverauthfile
 xauth -q -f $xserverauthfile << EOF
 add :$dummy . $mcookie
 EOF
+
 serverargs=${serverargs}" -auth "${xserverauthfile}
 
 XCOMM now add the same credentials to the client authority file