diff -Naur freenx-0.7.1/node.conf.sample freenx-0.7.1-magellan/node.conf.sample
--- freenx-0.7.1/node.conf.sample	2007-10-15 00:25:14.000000000 +0200
+++ freenx-0.7.1-magellan/node.conf.sample	2007-10-19 01:33:03.000000000 +0200
@@ -370,10 +370,10 @@
 # session will be run.
 # Depending on distribution USER_X_STARTUP_SCRIPT might be .Xclients, .xinitrc
 # and .Xsession
-# Depending on distribution DEFAULT_X_SESSION might be /etc/X11/xdm/Xsession,
-# /etc/X11/Sessions/Xsession or /etc/X11/xinit/xinitrc
+# Depending on distribution DEFAULT_X_SESSION might be /usr/lib/X11/xdm/Xsession,
+# /etc/X11/xdm/Xsession, /etc/X11/Sessions/Xsession or /etc/X11/xinit/xinitrc
 #USER_X_STARTUP_SCRIPT=.Xclients
-#DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
+#DEFAULT_X_SESSION=/usr/lib/X11/xdm/Xsession
 
 # The key that contains the name of the script that starts a KDE session.
 # It's run when a 'unix-kde' session is requested by the client.
@@ -394,7 +394,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'.
@@ -476,7 +476,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.7.1/nxdialog freenx-0.7.1-magellan/nxdialog
--- freenx-0.7.1/nxdialog	2007-10-15 00:25:14.000000000 +0200
+++ freenx-0.7.1-magellan/nxdialog	2007-10-19 01:36:03.000000000 +0200
@@ -107,7 +107,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.7.1/nxloadconfig freenx-0.7.1-magellan/nxloadconfig
--- freenx-0.7.1/nxloadconfig	2007-10-15 00:25:14.000000000 +0200
+++ freenx-0.7.1-magellan/nxloadconfig	2007-10-19 01:35:39.000000000 +0200
@@ -171,12 +171,12 @@
 DEFAULT_X_WM=""
 KILL_DEFAULT_X_WM="1"
 USER_X_STARTUP_SCRIPT=.Xclients
-DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
+DEFAULT_X_SESSION=/usr/lib/X11/xdm/Xsession
 COMMAND_START_KDE=startkde
 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_SMBMOUNT_CIFS=/sbin/mount.cifs
@@ -205,7 +205,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=""