diff --git a/checkin_notes b/checkin_notes
index 4d98244088..f088494ebe 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6424,3 +6424,11 @@ Rom    23 July 2009
     
     client/
         main.cpp
+
+Rom    23 July 2009
+    - client: Treat power events similiar to the snooze events, assign
+        a timeout so that when we resume from suspend/hybernate we
+        restore the previous activity states.
+        
+    client/
+        main.cpp
diff --git a/client/main.cpp b/client/main.cpp
index b50b6db667..6aa2e600e9 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -570,8 +570,8 @@ int boinc_main_loop() {
         }
 #ifdef _WIN32
         if (requested_suspend) {
-            gstate.run_mode.set(RUN_MODE_NEVER, 0);
-            gstate.network_mode.set(RUN_MODE_NEVER, 0);
+            gstate.run_mode.set(RUN_MODE_NEVER, 3600);
+            gstate.network_mode.set(RUN_MODE_NEVER, 3600);
             requested_suspend = false;
         }
         if (requested_resume) {