--- xorg-server-1.6.5/dix/dispatch.c.sav	2009-10-12 04:52:40.000000000 +0200
+++ xorg-server-1.6.5/dix/dispatch.c	2010-01-01 23:38:11.280381583 +0100
@@ -3339,6 +3339,11 @@ int ProcForceScreenSaver(ClientPtr clien
     rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, (int)stuff->mode);
     if (rc != Success)
 	return rc;
+    if (stuff->mode == ScreenSaverReset)
+    {
+        UpdateCurrentTimeIf();
+        lastDeviceEventTime = currentTime;
+    }
     return client->noClientException;
 }