diff --git a/checkin_notes b/checkin_notes
index 62e8deb4fc..8249809a86 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6045,7 +6045,7 @@ David  30 July 2008
         client_state.C
 
 Rom    31 July 2008
-    - SCR: Don't treat CPU throttling as BOINC beeing suspended.
+    - SCR: Don't treat CPU throttling as BOINC being suspended.
         Fixes #706
     - MGR: If the reminder frequency is 0, then don't show any
         reminder messages.
@@ -6055,4 +6055,12 @@ Rom    31 July 2008
     clientscr/
         screensaver.cpp
         screensaver_win.cpp
-    
\ No newline at end of file
+
+Charlie 1 Aug 2008
+    - SCR / CLIENT: fix get_screensaver_tasks RPC so it does not 
+        exclude tasks suspended for CPU throttling.  Fixes the 
+        screensaver problem for V6 graphics.  Checked into 
+        boinc_core_release_6_2_15 tag.
+        
+    client/
+        gui_rpc_server_ops.C
diff --git a/client/gui_rpc_server_ops.C b/client/gui_rpc_server_ops.C
index 2995b57e22..6ded328e59 100644
--- a/client/gui_rpc_server_ops.C
+++ b/client/gui_rpc_server_ops.C
@@ -488,7 +488,9 @@ static void handle_get_screensaver_tasks(MIOFILE& fout) {
     );
     for (i=0; i<gstate.active_tasks.active_tasks.size(); i++) {
         atp = gstate.active_tasks.active_tasks[i];
-        if (atp->task_state() == PROCESS_EXECUTING) {
+        if ((atp->task_state() == PROCESS_EXECUTING) || 
+                ((atp->task_state() == PROCESS_SUSPENDED) && 
+                        (gstate.suspend_reason & SUSPEND_REASON_CPU_USAGE_LIMIT))) {
             atp->result->write_gui(fout);
         }
     }