diff -Naur freenx-0.5.0.orig/node.conf.sample freenx-0.5.0/node.conf.sample
--- freenx-0.5.0.orig/node.conf.sample	2007-01-03 19:29:51.000000000 +0100
+++ freenx-0.5.0/node.conf.sample	2007-01-03 19:32:40.000000000 +0100
@@ -317,7 +317,7 @@
 
 # The key that contains the name of the complete path of command name
 # 'xauth'.
-#COMMAND_XAUTH=/usr/X11R6/bin/xauth
+#COMMAND_XAUTH=/usr/bin/xauth
 
 # The key that contains the name of the complete path of command name
 # 'smbmount'.
@@ -378,7 +378,7 @@
 # for examples of useful parameters.
 #AGENT_EXTRA_OPTIONS_RFB=""
 #AGENT_EXTRA_OPTIONS_RDP=""
-#AGENT_EXTRA_OPTIONS_X=""
+#AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11"
 
 # The number of seconds we wait for the nxagent to start before
 # deciding startup has failed
diff -Naur freenx-0.5.0.orig/nxclient freenx-0.5.0/nxclient
--- freenx-0.5.0.orig/nxclient	2007-01-03 19:29:51.000000000 +0100
+++ freenx-0.5.0/nxclient	2007-01-03 19:31:13.000000000 +0100
@@ -62,7 +62,7 @@
 else
 	dialog_interface="xmessage"
 	xmessage=$(which xmessage 2>/dev/null)
-	[ -z "$xmessage" ] && xmessage="/usr/X11R6/bin/xmessage"
+	[ -z "$xmessage" ] && xmessage="/usr/bin/xmessage"
 fi
 
 #
diff -Naur freenx-0.5.0.orig/nxloadconfig freenx-0.5.0/nxloadconfig
--- freenx-0.5.0.orig/nxloadconfig	2007-01-03 19:29:51.000000000 +0100
+++ freenx-0.5.0/nxloadconfig	2007-01-03 19:33:10.000000000 +0100
@@ -161,7 +161,7 @@
 COMMAND_START_GNOME=gnome-session
 COMMAND_START_CDE=cdwm
 COMMAND_XTERM=xterm
-COMMAND_XAUTH=/usr/X11R6/bin/xauth
+COMMAND_XAUTH=/usr/bin/xauth
 COMMAND_SMBMOUNT=smbmount
 COMMAND_SMBUMOUNT=smbumount
 COMMAND_NETCAT=netcat
@@ -184,7 +184,7 @@
 COMMAND_SESSREG="sessreg"
 AGENT_EXTRA_OPTIONS_RFB=""
 AGENT_EXTRA_OPTIONS_RDP=""
-AGENT_EXTRA_OPTIONS_X=""
+AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11"
 AGENT_STARTUP_TIMEOUT="60"
 AGENT_FONT_SERVER=""
 PROXY_TCP_NODELAY=""