diff --git a/checkin_notes b/checkin_notes
index 46553c14ae..75b42f9af9 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -8935,3 +8935,17 @@ Rom    17 Aug 2006
     clientgui/
         MainDocument.cpp, .h
         sg_BoincSimpleGUI.cpp
+
+Charlie 17 Aug 2006
+    -Mac: Fixed a bug in check_security() when ID of group boinc_master != ID of 
+        user boinc_master.
+    - Mac: XCode project sets S_ISUID and S_ISGID permission bits for stand-alone 
+        client to aid in debugging.
+    - Update obsolete screensaver test code in ss_logic.C.
+    
+    client/
+        check_security.C
+        ss_logic.C
+    mac_build/
+        boinc.xcodeproj/
+            project.pbxproj
diff --git a/client/check_security.C b/client/check_security.C
index cca5a21abd..6a2e9899a4 100644
--- a/client/check_security.C
+++ b/client/check_security.C
@@ -134,8 +134,8 @@ int use_sandbox, int isManager
         if ((sbuf.st_mode & (S_ISUID | S_ISGID)) != (S_ISUID | S_ISGID))
             return -1005;
 
-        boinc_master_uid = sbuf.st_gid;
-        boinc_master_gid = sbuf.st_uid;
+        boinc_master_uid = sbuf.st_uid;
+        boinc_master_gid = sbuf.st_gid;
     } else {
         boinc_master_uid = geteuid();
         boinc_master_gid = getegid();
diff --git a/client/ss_logic.C b/client/ss_logic.C
index ff7428e87c..6acc6ccac1 100644
--- a/client/ss_logic.C
+++ b/client/ss_logic.C
@@ -103,7 +103,7 @@ void SS_LOGIC::reset() {
     }
 }
 
-// called 10X per second
+// called 1X per second
 //
 void SS_LOGIC::poll() {
     ACTIVE_TASK* atp, *new_atp=0;
@@ -117,9 +117,24 @@ void SS_LOGIC::poll() {
 
 #if 0
     // if you want to debug screensaver functionality...
+#define BLANK_DELAY 15 /* seconds */
+#define SAVER_PERIOD 7 /* seconds */
+    GRAPHICS_MSG gm;
     static int foo=0;
     foo++;
-    if (foo == 8) start_ss(time(0)+1000);
+    if (foo == (SAVER_PERIOD)) {
+        msg_printf(0, MSG_INFO,
+            "starting screensaver"
+        );
+        start_ss(gm, time(0)+BLANK_DELAY);
+    } 
+    if (foo >= ((2*SAVER_PERIOD)+BLANK_DELAY)) {
+        msg_printf(0, MSG_INFO,
+            "resetting screensaver counter"
+        );
+        stop_ss();
+        foo = 0;
+    }
 #endif
 
     if (!do_ss) return;
diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj
index 6163559994..5bed48fd3c 100755
--- a/mac_build/boinc.xcodeproj/project.pbxproj
+++ b/mac_build/boinc.xcodeproj/project.pbxproj
@@ -2070,6 +2070,7 @@
 				DDD74D8407CF482E0065AC9D /* Sources */,
 				DDD74D8507CF482E0065AC9D /* Frameworks */,
 				DD46A43A088D1BEE00052C57 /* ShellScript */,
+				DD1B90070A954C9A00FF5591 /* ShellScript */,
 			);
 			buildRules = (
 				DD6826DF08641B1E0070CDB8 /* PBXBuildRule */,
@@ -2202,6 +2203,19 @@
 			shellPath = /bin/sh;
 			shellScript = "cp -fpv \"${SRCROOT}/Installer-Info.plist\" \"${BUILT_PRODUCTS_DIR}/BOINC Installer.app/Contents/Info.plist\"";
 		};
+		DD1B90070A954C9A00FF5591 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if [ \"$BUILD_STYLE\" != \"Deploy_noSandbox\" ] && [ \"$BUILD_STYLE\" != \"Dev_noSandbox\" ]; then\n    chown -R ${USER}:${GROUP} \"${BUILT_PRODUCTS_DIR}/boinc\"\n    chmod u+s,g+s \"${BUILT_PRODUCTS_DIR}/boinc\"\nfi";
+		};
 		DD3E15370A774397007E0084 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 12;