diff --git a/checkin_notes b/checkin_notes
index 3d1c7f5074..3a219f4f10 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5638,3 +5638,9 @@ Charlie 10 July 2008
         
     clientgui/
         BOINCListCtrl.h
+
+Rom    10 July 2008
+    - CC: Read the config file before setting the max file sizes.
+    
+    client/
+        main.C
diff --git a/client/main.C b/client/main.C
index 35b024abf8..286854a0ed 100644
--- a/client/main.C
+++ b/client/main.C
@@ -302,15 +302,18 @@ static void init_core_client(int argc, char** argv) {
     }
 
     diagnostics_init(flags, "stdoutdae", "stderrdae");
-    diagnostics_set_max_file_sizes(
-        config.max_stdout_file_size, config.max_stderr_file_size
-    );
 
     // Read config and parse the commandline after initializing the
     // diagnostics framework.
     read_config_file();
 
-	// Win32 - detach from console if requested
+    // Set the max file sizes of the logs based on user preferences.
+    //
+    diagnostics_set_max_file_sizes(
+        config.max_stdout_file_size, config.max_stderr_file_size
+    );
+
+    // Win32 - detach from console if requested
 #ifdef _WIN32
 	if (gstate.detach_console) {
 		FreeConsole();