diff -uNrp freenx-server-0.7.2.orig/node.conf.sample freenx-server-0.7.2/node.conf.sample
--- freenx-server-0.7.2.orig/node.conf.sample	2008-03-14 16:47:47.000000000 -0500
+++ freenx-server-0.7.2/node.conf.sample	2008-04-12 10:58:12.000000000 -0500
@@ -443,11 +443,11 @@
 
 # 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.
-#COMMAND_START_KDE=startkde
+#COMMAND_START_KDE="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/startkde"
 
 # The key that contains the name of the script that starts a gnome session.
 # It's run when a 'unix-gnome' session is requested by the client.
-#COMMAND_START_GNOME=gnome-session
+#COMMAND_START_GNOME="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/gnome-session"
 
 # The key that contains the name of the script that starts a CDE session.
 # It's run when a 'unix-cde' session is requested by the client.
@@ -479,7 +479,7 @@
 #COMMAND_SMBUMOUNT_CIFS=/sbin/umount.cifs
 
 # The key that contains the name of the complete path of the 'netcat' command.
-#COMMAND_NETCAT=netcat
+#COMMAND_NETCAT=nc
 
 # The key that contains the name of the complete path of the 'ssh' and
 # 'ssh-keygen' command.
diff -uNrp freenx-server-0.7.2.orig/nxloadconfig freenx-server-0.7.2/nxloadconfig
--- freenx-server-0.7.2.orig/nxloadconfig	2008-03-14 16:47:47.000000000 -0500
+++ freenx-server-0.7.2/nxloadconfig	2008-04-12 11:01:20.000000000 -0500
@@ -180,8 +180,8 @@ DEFAULT_X_WM=""
 KILL_DEFAULT_X_WM="1"
 USER_X_STARTUP_SCRIPT=.Xclients
 DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
-COMMAND_START_KDE=startkde
-COMMAND_START_GNOME=gnome-session
+COMMAND_START_KDE="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/startkde"
+COMMAND_START_GNOME="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/gnome-session"
 COMMAND_START_CDE=cdwm
 COMMAND_XTERM=xterm
 COMMAND_XAUTH=/usr/X11R6/bin/xauth
@@ -189,7 +189,7 @@ COMMAND_SMBMOUNT=smbmount
 COMMAND_SMBUMOUNT=smbumount
 COMMAND_SMBMOUNT_CIFS=/sbin/mount.cifs
 COMMAND_SMBUMOUNT_CIFS=/sbin/umount.cifs
-COMMAND_NETCAT=netcat
+COMMAND_NETCAT=nc
 COMMAND_SSH=ssh
 COMMAND_SSH_KEYGEN=ssh-keygen
 COMMAND_CUPSD=/usr/sbin/cupsd
@@ -307,7 +307,7 @@ fi
 [ -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.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so.2:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
 
 NX_BACKEND_VERSION=$(strings $PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g')
 
diff -uNrp freenx-server-0.7.2.orig/nxsetup freenx-server-0.7.2/nxsetup
--- freenx-server-0.7.2.orig/nxsetup	2008-03-14 16:47:47.000000000 -0500
+++ freenx-server-0.7.2/nxsetup	2008-04-12 11:09:06.000000000 -0500
@@ -49,6 +49,7 @@ parse_cmdline()
 			--uninstall) UNINSTALL="yes"; shift ;;
 			--purge) PURGE="yes"; shift ;;
 			--auto) AUTOMATIC="yes"; shift ;;
+			--override) OVERRIDE="yes"; shift ;;
 			--test) TEST="yes"; shift ;;
 			--) shift ; break ;;
 			*) echo "Invalid flag $1" ; HELP="yes"; shift ; break ;;
@@ -65,7 +66,7 @@ parse_cmdline()
 	[ "$UNINSTALL" = "yes" -a "$CLEAN" = "yes" ] && HELP="yes"
 	[ "$SETUP_SSH2_KEY" = "yes" -a "$SETUP_NOMACHINE_KEY" = "no" ] && HELP="yes"
 
-	if [ "$INSTALL" = "no" -a "$UNINSTALL" = "no" -a "$AUTOMATIC" = "no" -a "$HELP" = "no" ]
+	if [ "$INSTALL" = "no" -a "$UNINSTALL" = "no" -a "$AUTOMATIC" = "no" -a "$HELP" = "no" -a "$OVERRIDE" = "yes" ]
 	then
 		echo "------> You did select no action."
 		echo "        FreeNX guesses that you want to _install_ the server."
@@ -81,6 +82,20 @@ parse_cmdline()
 
 	[ "$INSTALL" = "no" -a "$UNINSTALL" = "no" ] && HELP="yes"
 
+	if [ "$OVERRIDE" = "no" ]
+	then
+		echo "Your FreeNX server was already setup and configured by the RPM."
+		echo
+		echo "You should only need to copy the client.id_dsa.key from /etc/nxserver to your client,"
+		echo "then properly import the key into the client setup. Only proceed with nxsetup if you"
+		echo "know exactly what you are doing."
+		echo
+		echo "To bypass this message, add the following to the nxsetup arguments:"
+		echo "  --override"
+		echo
+		exit 0
+	fi
+
 	if [ "$HELP" = "yes" ]
 	then
 		echo "nxsetup - Setup the FreeNX server."