diff --git a/checkin_notes b/checkin_notes
index 46b8b3068a..9c3a782393 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -10161,3 +10161,13 @@ David  9 Aug 2005
 		gui_rpc_client.h
 		gui_rpc_client_ops.C
 		gui_rpc_client_print.C
+
+Bruce 9 August 2005
+    - Client fixes from Walt Gribben.  Do regular checks for drive free
+      space.  And retrieve host info after call that reads client_state.xml
+      has wiped it out.
+
+    client/
+        app_control.C
+        client_state.C
+
diff --git a/client/app_control.C b/client/app_control.C
index 24a255b89e..33be12457a 100644
--- a/client/app_control.C
+++ b/client/app_control.C
@@ -491,6 +491,7 @@ bool ACTIVE_TASK_SET::check_rsc_limits_exceeded() {
         else if (atp->check_max_mem_exceeded()) return true;
         else if (gstate.now>last_disk_check_time + gstate.global_prefs.disk_interval) {
             last_disk_check_time = gstate.now;
+            get_filesystem_info(gstate.host_info.d_total, gstate.host_info.d_free);
             if (atp->check_max_disk_exceeded()) return true;
         }
     }
diff --git a/client/client_state.C b/client/client_state.C
index 007364d0d5..9afcddb3bd 100644
--- a/client/client_state.C
+++ b/client/client_state.C
@@ -281,6 +281,12 @@ int CLIENT_STATE::init() {
     //
     parse_state_file();
 
+    // parse_state_file wiped out the current host info, get it again
+    //
+    host_info.clear_host_info();
+    host_info.get_host_info();
+    set_ncpus();
+ 
     // Check to see if we can write the state file.
     //
     retval = write_state_file();