diff -urN main/libvo/x11_common.c main_xsaver_error2/libvo/x11_common.c
--- main/libvo/x11_common.c	2005-11-23 11:26:04.581229040 +0100
+++ main_xsaver_error2/libvo/x11_common.c	2005-12-01 00:54:46.139698440 +0100
@@ -1598,10 +1598,10 @@
     xs_windowid = find_xscreensaver_window(dpy);
     if (!xs_windowid)
     {
-        mp_msg(MSGT_VO, MSGL_INFO, MSGTR_CouldNotFindXScreenSaver);
+        mp_msg(MSGT_VO, MSGL_V, MSGTR_CouldNotFindXScreenSaver);
         return;
     }
-    mp_msg(MSGT_VO, MSGL_INFO,
+    mp_msg(MSGT_VO, MSGL_V,
            "xscreensaver_disable: xscreensaver wid=%d.\n", xs_windowid);
 
     deactivate = XInternAtom(dpy, "DEACTIVATE", False);
diff -urN main/mplayer.c main_xsaver_error2/mplayer.c
--- main/mplayer.c	2005-11-28 17:31:54.000461304 +0100
+++ main_xsaver_error2/mplayer.c	2005-12-01 00:47:25.085748832 +0100
@@ -3039,6 +3039,10 @@
       mp_cmd_free(cmd);
       }
          osd_function=OSD_PLAY;
+#ifdef HAVE_X11
+      if (stop_xscreensaver && sh_video)
+        vo_init();
+#endif
       if (audio_out && sh_audio)
         audio_out->resume();	// resume audio
       if (video_out && sh_video && vo_config_count)