Index: configure
===================================================================
--- configure	(revision 6733)
+++ configure	(working copy)
@@ -60,6 +60,7 @@
 PROFILEFLAGS=""
 proc_opt="no"
 dvd="yes"
+xss="no"
 v4l="no"
 frontend="yes"
 backend="no"
@@ -134,6 +135,7 @@
 echo "  --disable-audio-arts     disable aRts audio support"
 echo "  --disable-audio-jack     disable JACK audio support"
 echo "  --disable-dvd            disable native DVD playback"
+echo "  --enable-xss             enable XScreenSaver support"
 echo "  --disable-frontend       disable frontend [breaks dependency checking]"
 echo "  --disable-backend        disable backend  [breaks dependency checking]"
 #echo "  --disable-audio-beos     disable BeOS audio support [default=no]"
@@ -745,6 +747,10 @@
   ;;
   --disable-dvd) dvd="no"
   ;;
+  --enable-xss) xss="yes"
+  ;;
+  --disable-xss) xss="no"
+  ;; 
   --enable-frontend) frontend="yes"
   ;;
   --disable-frontend) frontend="no"
@@ -1990,6 +1996,7 @@
 
 echo "# Misc Features"
 echo "DVD playback     $dvd"
+echo "XScreenSaver     $xss" 
 echo "Frontend         $frontend"
 echo "Backend          $backend"
 echo
@@ -2517,7 +2524,10 @@
   echo "CONFIG_DVD_LIBS=-ldvdnav" >> $MYTH_CONFIG_MAK
 fi
 
-
+if test x"$xss" = x"yes" ; then
+  CCONFIG="$CCONFIG using_xss"
+fi
+   
 if test x"$xrandr" = x"yes" ; then
   CCONFIG="$CCONFIG using_xrandr"
 fi
Index: libs/libmyth/screensaver.cpp
===================================================================
--- libs/libmyth/screensaver.cpp	(revision 6733)
+++ libs/libmyth/screensaver.cpp	(working copy)
@@ -2,7 +2,9 @@
 #include "config.h"
 #include "screensaver.h"
 #include "screensaver-null.h"
-#if defined(Q_WS_X11)
+#ifdef USE_XSS
+#include "screensaver-xss.h"
+#elif defined(Q_WS_X11)
 #include "screensaver-x11.h"
 #endif
 #ifdef CONFIG_DARWIN
@@ -17,7 +19,9 @@
     if (!ScreenSaverSingleton)
     {
   
-#if defined(Q_WS_X11)
+#if defined(USE_XSS)
+        ScreenSaverSingleton = new ScreenSaverXSS();
+#elif defined(Q_WS_X11)
         ScreenSaverSingleton = new ScreenSaverX11();
 #elif defined(CONFIG_DARWIN)
         ScreenSaverSingleton = new ScreenSaverOSX();
Index: libs/libmyth/libmyth.pro
===================================================================
--- libs/libmyth/libmyth.pro	(revision 6733)
+++ libs/libmyth/libmyth.pro	(working copy)
@@ -139,11 +139,19 @@
 }
 
 using_x11 {
+    using_xss {
+        DEFINES += USE_XSS
+        HEADERS += screensaver-xss.h
+        SOURCES += screensaver-xss.cpp
+    }
+    !using_xss {
     HEADERS += screensaver-x11.h
     SOURCES += screensaver-x11.cpp
+    }
     LIBS += $$EXTRA_LIBS
 }
 
+
 using_xrandr {
     DEFINES += USING_XRANDR
     HEADERS += DisplayResX.h