diff --git a/checkin_notes b/checkin_notes
index da92503c46..43c3a5e6f2 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2108,3 +2108,10 @@ David  4 Apr 2011
 
     client/
         cs_notices.cpp
+
+David  4 Apr 2011
+    - client: use larger buffer for app command line,
+        enough to accommodate 64KB from wu.cmdline
+
+    client/
+        app_start.cpp
diff --git a/client/app_start.cpp b/client/app_start.cpp
index d57e9ff330..dfe5826ddc 100644
--- a/client/app_start.cpp
+++ b/client/app_start.cpp
@@ -417,7 +417,7 @@ int ACTIVE_TASK::copy_output_files() {
 //
 int ACTIVE_TASK::start(bool first_time) {
     char exec_name[256], file_path[256], buf[256], exec_path[256];
-    char cmdline[8192];
+    char cmdline[80000];    // 64KB plus some extra
     unsigned int i;
     FILE_REF fref;
     FILE_INFO* fip;