Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86DPMS.c
===================================================================
--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86DPMS.c
+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86DPMS.c
@@ -160,7 +160,8 @@ DPMSSet(ClientPtr client, int level)
 	rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive);
 	if (rc != Success)
 	    return rc;
-    }
+    } else
+	dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
     /* For each screen, set the DPMS level */
     for (i = 0; i < xf86NumScreens; i++) {