diff -Naur xfce-utils-4.8.2/scripts/xinitrc.in xfce-utils-4.8.2-magellan/scripts/xinitrc.in
--- xfce-utils-4.8.2/scripts/xinitrc.in	2011-06-18 08:06:05.000000000 +0200
+++ xfce-utils-4.8.2-magellan/scripts/xinitrc.in	2011-07-12 22:29:18.000000000 +0200
@@ -185,7 +185,7 @@
 # launch a screensaver if enabled.  do not launch if we're root or if
 # we're in a VNC session.
 screensaver_enabled=`xfconf-query -c xfce4-session -p /startup/screensaver/enabled 2> /dev/null`
-if test $UID -gt 0 -a -z "$VNCSESSION" -a "$screensaver_enabled" != "false"; then
+if test $UID -gt 0 -a -z "$VNCSESSION" -a -z "$NX_SYSTEM" -a "$screensaver_enabled" != "false"; then
     screensaver_type=`xfconf-query -c xfce4-session -p /startup/screensaver/type 2> /dev/null`
 
     case "$screensaver_type" in
diff -Naur xfce-utils-4.8.2/scripts/xinitrc.in.in xfce-utils-4.8.2-magellan/scripts/xinitrc.in.in
--- xfce-utils-4.8.2/scripts/xinitrc.in.in	2011-06-18 08:05:25.000000000 +0200
+++ xfce-utils-4.8.2-magellan/scripts/xinitrc.in.in	2011-07-12 22:29:48.000000000 +0200
@@ -185,7 +185,7 @@
 # launch a screensaver if enabled.  do not launch if we're root or if
 # we're in a VNC session.
 screensaver_enabled=`xfconf-query -c xfce4-session -p /startup/screensaver/enabled 2> /dev/null`
-if test $UID -gt 0 -a -z "$VNCSESSION" -a "$screensaver_enabled" != "false"; then
+if test $UID -gt 0 -a -z "$VNCSESSION" -a -z "$NX_SYSTEM" -a "$screensaver_enabled" != "false"; then
     screensaver_type=`xfconf-query -c xfce4-session -p /startup/screensaver/type 2> /dev/null`
 
     case "$screensaver_type" in