--- nxloadconfig.orig	2009-03-12 18:29:22.000000000 +0100
+++ nxloadconfig	2009-03-12 18:29:53.000000000 +0100
@@ -58,7 +58,7 @@
 # Where can different nx components be found
 NX_DIR=/usr
 PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
-PATH_LIB=$NX_DIR/lib
+PATH_LIB=$NX_DIR/lib/NX/lib
 NX_ETC_DIR=/etc/nxserver
 NX_SESS_DIR=/var/lib/nxserver/db
 NX_HOME_DIR=/var/lib/nxserver/home
@@ -194,11 +194,11 @@
 KILL_DEFAULT_X_WM="1"
 BOOTSTRAP_X_SESSION="0"
 USER_X_STARTUP_SCRIPT=.Xclients
-DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
+DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession
 COMMAND_GDM_X_SESSION="/etc/gdm/Xsession custom"
 if [ ! -x "$COMMAND_GDM_X_SESSION" ]
 then
-	COMMAND_GDM_X_SESSION="/etc/X11/Xsession"
+	COMMAND_GDM_X_SESSION="/etc/X11/Sessions/Xsession"
 fi
 COMMAND_START_KDE=startkde
 COMMAND_START_GNOME=gnome-session
@@ -224,7 +224,7 @@
 COMMAND_NXSHADOWACL="$PATH_BIN/nxshadowacl"
 COMMAND_NXACL="$PATH_BIN/nxacl"
 COMMAND_NXCHECKLOAD="$PATH_BIN/nxcheckload"
-COMMAND_NXAGENT="$PATH_BIN/nxagent"
+COMMAND_NXAGENT="REAL_PATH_LIB/nxagent"
 
 # Guest directives
 ENABLE_GUEST_LOGIN="0"
@@ -357,7 +357,7 @@
 [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
 [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
 [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
-[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
+[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
 
 NX_BACKEND_VERSION=$(strings $COMMAND_NXAGENT 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g')