diff --git a/checkin_notes b/checkin_notes
index deac2388b8..a10d93853f 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6819,3 +6819,10 @@ David  19 Aug 2008
     lib/
         filesys.C
         str_util.C,h
+
+Charlie 19 Aug 2008
+    - lib: changed boinc_copy() to enclose path strings in quotes instead 
+        of escaping spaces.
+        
+    lib/
+        filesys.C
diff --git a/lib/filesys.C b/lib/filesys.C
index 0e48c0c92b..8375e8c1c0 100644
--- a/lib/filesys.C
+++ b/lib/filesys.C
@@ -492,14 +492,12 @@ int boinc_copy(const char* orig, const char* newf) {
     }
     return 0;
 #elif defined(__EMX__)
-    char cmd[1024], cmd_esc[1024];
-    sprintf(cmd, "copy %s %s", orig, newf);
-    string_substitute(cmd, cmd_esc, sizeof(cmd_esc), " ", "\\ ");
+    char cmd[1024];
+    sprintf(cmd, "copy \"%s\" \"%s\"", orig, newf);
     return system(cmd_esc);
 #else
     char cmd[1024], cmd_esc[1024];
-    sprintf(cmd, "cp %s %s", orig, newf);
-    string_substitute(cmd, cmd_esc, sizeof(cmd_esc), " ", "\\ ");
+    sprintf(cmd, "cp \"%s\" \"%s\"", orig, newf);
     return system(cmd_esc);
 #endif
 }