diff -Naur xfce-utils-4.6.2/scripts/xinitrc.in xfce-utils-4.6.2-magellan/scripts/xinitrc.in
--- xfce-utils-4.6.2/scripts/xinitrc.in	2010-05-21 18:56:36.000000000 +0200
+++ xfce-utils-4.6.2-magellan/scripts/xinitrc.in	2010-10-07 16:23:42.000000000 +0200
@@ -100,7 +100,7 @@
 test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
 
 # Launch xscreensaver (if available), but only as non-root user
-if test $UID -gt 0 -a -z "$VNCSESSION"; then 
+if test $UID -gt 0 -a -z "$VNCSESSION" -a -z "$NX_SYSTEM"; then 
     if test x"`which xscreensaver 2>/dev/null`" != x""; then
         xscreensaver -no-splash &
     elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then
diff -Naur xfce-utils-4.6.2/scripts/xinitrc.in.in xfce-utils-4.6.2-magellan/scripts/xinitrc.in.in
--- xfce-utils-4.6.2/scripts/xinitrc.in.in	2010-05-21 18:56:26.000000000 +0200
+++ xfce-utils-4.6.2-magellan/scripts/xinitrc.in.in	2010-10-07 16:24:03.000000000 +0200
@@ -100,7 +100,7 @@
 test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
 
 # Launch xscreensaver (if available), but only as non-root user
-if test $UID -gt 0 -a -z "$VNCSESSION"; then 
+if test $UID -gt 0 -a -z "$VNCSESSION" -a -z "$NX_SYSTEM"; then 
     if test x"`which xscreensaver 2>/dev/null`" != x""; then
         xscreensaver -no-splash &
     elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then