diff --git a/checkin_notes b/checkin_notes
index 50dbc4f0da..3c69db72df 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -14015,3 +14015,15 @@ David  2004.06.18
 Rom    June 19 2004
     - Tag for 3.17 release, all platforms
       boinc_core_release_3_17
+
+Rom    June 19 2004
+    - Lengthen the benchmarks so even on slow machines they won't get stuck in an
+      endless loop waiting on a file that has already come and gone.
+
+    client/
+        cs_benchmark.C
+
+Rom    June 19 2004
+    - Tag for 3.18 release, all platforms
+      boinc_core_release_3_18
+
diff --git a/client/cs_benchmark.C b/client/cs_benchmark.C
index f41975a43e..e1767078c0 100644
--- a/client/cs_benchmark.C
+++ b/client/cs_benchmark.C
@@ -75,9 +75,9 @@
 #define DEFAULT_CACHE   1e6
 
 #define FP_START    2
-#define FP_END      6
-#define INT_START   8
-#define INT_END     12
+#define FP_END      22
+#define INT_START   37
+#define INT_END     57
 
 #define BM_FP_INIT  0
 #define BM_FP       1
@@ -141,7 +141,7 @@ bool benchmark_time_to_stop(int which) {
 }
 
 // benchmark a single CPU
-// This takes 10-20 seconds,
+// This takes 60-120 seconds,
 //
 int cpu_benchmarks(BENCHMARK_DESC* bdp) {
     HOST_INFO host_info;