diff --git a/checkin_notes b/checkin_notes
index 994c5aca2f..b5a131285b 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -2542,3 +2542,10 @@ David  2 Mar 2006
         parse.C,h
     sched/
         file_upload_handler.C
+
+David  2 Mar 2006
+    - core client: when host CPID changes,
+        delay the resulting scheduler RPCs by 15 seconds
+
+    client/
+        cs_scheduler.C
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index 04adfca284..53e67f5739 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -1129,7 +1129,7 @@ void CLIENT_STATE::generate_new_host_cpid() {
     host_info.generate_host_cpid();
     for (unsigned int i=0; i<projects.size(); i++) {
         projects[i]->sched_rpc_pending = true;
-        projects[i]->min_rpc_time = 0;
+        projects[i]->min_rpc_time = now + 15;
     }
 }