diff --git a/checkin_notes b/checkin_notes
index fbbc38315a..3264f0fcc9 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6190,3 +6190,9 @@ David  6 July 2009
         sim_util.cpp
     html/inc/
         boinc_db.inc
+
+Charlie 7 July 2009
+    - Mac Installer: use escaped form of brand name when needed.
+
+    mac_installer/
+        PostInstall.cpp
diff --git a/mac_installer/PostInstall.cpp b/mac_installer/PostInstall.cpp
index 656c9af2ac..3061ce765a 100755
--- a/mac_installer/PostInstall.cpp
+++ b/mac_installer/PostInstall.cpp
@@ -62,6 +62,8 @@ extern int check_security(char *bundlePath, char *dataPath, int use_sandbox, int
 #define NUMBRANDS 3
 
 static Boolean                  gQuitFlag = false;	/* global */
+
+static char *brandNameEscaped[NUMBRANDS];
 static char *brandName[NUMBRANDS];
 static char *appName[NUMBRANDS];
 static char *appNameEscaped[NUMBRANDS];
@@ -106,16 +108,19 @@ int main(int argc, char *argv[])
     appName[0] = "/Applications/BOINCManager.app";
     appNameEscaped[0] = "/Applications/BOINCManager.app";
     brandName[0] = "BOINC";
+    brandNameEscaped[0] = "BOINC";
     receiptNameEscaped[0] = "/Library/Receipts/BOINC.pkg";
 
     appName[1] = "/Applications/GridRepublic Desktop.app";
     appNameEscaped[1] = "/Applications/GridRepublic\\ Desktop.app";
     brandName[1] = "GridRepublic";
+    brandNameEscaped[1] = "GridRepublic";
     receiptNameEscaped[1] = "/Library/Receipts/GridRepublic\\ Desktop.pkg";
 
     appName[2] = "/Applications/Progress Thru Processors Desktop.app";
     appNameEscaped[2] = "/Applications/Progress\\ Thru\\ Processors\\ Desktop.app";
     brandName[2] = "Progress Thru Processors";
+    brandNameEscaped[2] = "Progress\\ Thru\\ Processors";
     receiptNameEscaped[2] = "/Library/Receipts/Progress\\ Thru\\ Processors.pkg";
 
     for (i=0; i<argc; i++) {
@@ -161,7 +166,7 @@ int main(int argc, char *argv[])
         system (s);
         
         // "rm -rf /Library/Screen\\ Savers/GridRepublic.saver"
-        sprintf(s, "rm -rf /Library/Screen\\ Savers/%s.saver", brandName[brandID]);
+        sprintf(s, "rm -rf /Library/Screen\\ Savers/%s.saver", brandNameEscaped[brandID]);
         system (s);
         
         // "rm -rf /Library/Receipts/GridRepublic.pkg"
@@ -278,7 +283,7 @@ int main(int argc, char *argv[])
 
     // Set owner of BOINC Screen Saver
     // "chown -Rf username /Library/Screen\\ Savers/GridRepublic.saver"
-    sprintf(s, "chown -Rf %s /Library/Screen\\ Savers/%s.saver", p, brandName[brandID]);
+    sprintf(s, "chown -Rf %s /Library/Screen\\ Savers/%s.saver", p, brandNameEscaped[brandID]);
     system (s);
 
     //  We don't customize BOINC Data directory name for branding
@@ -301,7 +306,7 @@ int main(int argc, char *argv[])
         system (s);
         
         // "rm -rf /Library/Screen\\ Savers/GridRepublic.saver"
-        sprintf(s, "rm -rf /Library/Screen\\ Savers/%s.saver", brandName[brandID]);
+        sprintf(s, "rm -rf /Library/Screen\\ Savers/%s.saver", brandNameEscaped[brandID]);
         system (s);
     }