diff --git a/checkin_notes b/checkin_notes
index 34b24b92ab..d45a288392 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -687,10 +687,11 @@ Charlie Jan 17 2008
         check_security.C
     clientgui/
         mac/
-            Mac_SA_Secure.sh
             SetupSecurity.cpp
     doc/
         sandbox.php
+    mac_build/
+        Mac_SA_Secure.sh
 
 David  Jan 18 2008
     - scheduler: if get request w/o host ID,
@@ -1663,3 +1664,10 @@ David  Feb 26 2008
     tools/
         backend_lib.C
         create_work.C
+
+Charlie Feb 26 2008
+    - Mac sandbox: set ownership and permissions for gfx_switcher in screensaver 
+        if it exists.
+        
+    mac_build/
+        Mac_SA_Secure.sh
diff --git a/mac_build/Mac_SA_Secure.sh b/mac_build/Mac_SA_Secure.sh
index a6513dde34..8d1b1b4e41 100755
--- a/mac_build/Mac_SA_Secure.sh
+++ b/mac_build/Mac_SA_Secure.sh
@@ -228,4 +228,7 @@ if [ -x /Applications/BOINCManager.app/Contents/Resources/boinc ] ; then
     set_perm /Applications/BOINCManager.app/Contents/Resources/boinc boinc_master boinc_master 6555
 fi
 
-
+# Version 6 screensaver has its own embedded switcher application, but older versions don't.
+if [ -x "/Library/Screen Savers/BOINCSaver.saver/Contents/Resources/gfx_switcher" ] ; then 
+    set_perm  "/Library/Screen Savers/BOINCSaver.saver/Contents/Resources/gfx_switcher" root boinc_master 4555
+fi