--- xinitrc.orig	2007-09-28 17:52:21.000000000 +0200
+++ xinitrc	2007-09-28 18:01:24.000000000 +0200
@@ -53,7 +53,7 @@
 test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
 
 # Launch xscreensaver (if available), but only as non-root user
-test $UID -gt 0 -a -z "$VNCSESSION" && xscreensaver -no-splash &
+test $UID -gt 0 -a -z "$VNCSESSION" -a x"$DISABLE_XSCREENSAVER" != "xyes" && xscreensaver -no-splash &
 
 # Use ssh-agent if installed and not already running.  Run it separately
 # so it populates the environment here, so we can clean it up later.