diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp
index 6d8be85033..0ca2a51ee5 100644
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
@@ -1294,7 +1294,7 @@ int start_timer_thread() {
 #else
     pthread_attr_t thread_attrs;
     pthread_attr_init(&thread_attrs);
-    pthread_attr_setstacksize(&thread_attrs, 16384);
+    pthread_attr_setstacksize(&thread_attrs, 32768);
     int retval = pthread_create(&timer_thread_handle, &thread_attrs, timer_thread, NULL);
     if (retval) {
         fprintf(stderr,
diff --git a/checkin_notes b/checkin_notes
index b65f7905bc..9e9406a7da 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4455,3 +4455,11 @@ David  20 June 2012
 
     html/inc/
         stats_sites.inc
+
+David  20 June 2012
+    - API, Linux: increase timer thread stack size from 16K to 32K.
+        Apparently new use of MAXPATHLEN can cause overflow.
+        Fixes #1191
+
+    api/
+        boinc_api.cpp