diff --git a/checkin_notes b/checkin_notes
index b76094f14d..20b6fddb58 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -2994,15 +2994,19 @@ David  2 Apr 2007
 		prefs.C
 
 Charlie 3 Apr 2007
-    - Mac: Change name of Postinstall.app to PostInstall.app to fix a problem 
-        on some Macs where the postinstall or postupgrade script failed to 
-        launch PostInstall.app due to the lower-case I.  I don't know why some 
+    - Mac Installer: Change name of Postinstall.app to PostInstall.app to fix a 
+        problem on some Macs where the postinstall or postupgrade script failed 
+        to launch PostInstall.app due to the lower-case I.  I don't know why some 
         Macs would be case-sensitive here while others aren't, but user feedback 
         seems to confirm this problem.
+    - Mac Installer: Add directions for removing users boinc_master and boinc_user 
+        to uninstall instructions.
         
     mac_build/
         boinc.xcodeproj/
             project.pbxproj
     mac_installer/
+        GR-ReadMe.rtf
+        ReadMe.rtf
         release_boinc.sh
         release_GridRepublic.sh
diff --git a/mac_installer/GR-ReadMe.rtf b/mac_installer/GR-ReadMe.rtf
index 9ebf510e31..8aa60e6cd8 100644
--- a/mac_installer/GR-ReadMe.rtf
+++ b/mac_installer/GR-ReadMe.rtf
@@ -2,7 +2,7 @@
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid1}}
+{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid1}}
 {\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}}
 \margl1440\margr1440\vieww9000\viewh9000\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc
@@ -133,29 +133,44 @@ You can move (
 \cf0 To completely remove (
 \f0\b uninstall
 \f1\b0 ) GridRepublic from your Macintosh:\
-\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural
-\ls1\ilvl0\cf0 	\'a5 Move the following files to the trash:\
-\pard\tx940\tx1440\pardeftab720\li1200\fi-1200\ql\qnatural
-\ls1\ilvl1\cf0 	\'a5 
-\f0\b GridRepublic Desktop.app
+\pard\tx720\pardeftab720\ql\qnatural
+\cf0 \'a5 There is no harm in leaving the "hidden" users 
+\f0\b boinc_master
+\f1\b0  and 
+\f0\b boinc_project
+\f1\b0  on your computer.  If you wish, you can remove them either by using the Applications/Utilities/NetInfo Manager application or by running the shell script 
+\f0\b Mac_SA_Insecure.sh
+\f1\b0 , which you can download from \
+	{\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/mac_build/Mac_SA_Insecure.sh"}}{\fldrslt http://boinc.berkeley.edu/mac_build/Mac_SA_Insecure.sh}}\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural\pardirnatural
+\cf0 Note: this script must be run in the Terminal application 
+\f2\i before
+\f1\i0  deleting the 
+\f0\b BOINC Data
+\f1\b0  folder.\
+\pard\tx720\pardeftab720\ql\qnatural
+\cf0 \'a5 Move the following files to the trash:\
+\pard\tx220\tx720\tx1440\pardeftab720\li720\fi-720\ql\qnatural
+\ls1\ilvl0
+\f0\b \cf0 {\listtext	\'a5	}GridRepublic Desktop.app
 \f1\b0  (from your 
 \f0\b /Applications/
 \f1\b0  folder)\
-	\'a5 
-\f0\b GridRepublic.saver
+\ls1\ilvl0
+\f0\b {\listtext	\'a5	}GridRepublic.saver
 \f1\b0  (from your 
 \f0\b /Library/Screen Savers/
 \f1\b0  folder)\
-	\'a5 the 
+{\listtext	\'a5	}the 
 \f0\b BOINC Data/
 \f1\b0  folder (from your
 \f0\b /Library/Applications Support/
 \f1\b0  folder.)\
-	\'a5 
-\f0\b [username]/Library/Preferences/BOINC Manager Preferences
+\ls1\ilvl0
+\f0\b {\listtext	\'a5	}[username]/Library/Preferences/BOINC Manager Preferences
 \f1\b0 \
-\pard\tx220\tx720\pardeftab720\li400\fi-400\ql\qnatural
-\ls1\ilvl0\cf0 	\'a5 Open the 
+\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural
+\ls1\ilvl0\cf0 {\listtext	\'a5	}Open the 
 \f0\b Accounts
 \f1\b0  pane in the 
 \f0\b System Preferences
@@ -164,8 +179,7 @@ You can move (
 \f1\b0  (or 
 \f0\b Startup Items
 \f1\b0  under OS 10.3.)\
-\pard\tx220\tx720\pardeftab720\li360\fi-360\ql\qnatural
-\ls1\ilvl0\cf0 	\'a5 Open 
+{\listtext	\'a5	}Open 
 \f0\b System Preferences
 \f1\b0  from the Apple menu. Select 
 \f0\b Desktop & Screen Saver
diff --git a/mac_installer/ReadMe.rtf b/mac_installer/ReadMe.rtf
index fa515ca3d9..b37e2bad69 100644
--- a/mac_installer/ReadMe.rtf
+++ b/mac_installer/ReadMe.rtf
@@ -2,7 +2,7 @@
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid1}}
+{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid1}}
 {\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}}
 \margl1440\margr1440\vieww9000\viewh9000\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc
@@ -129,34 +129,48 @@ You can move (
 \f0\b not
 \f1\b0  copy) BOINCManager to any folder you wish on the same disk drive or partition.  If you do so, you will need to update the information in each user's Login Items.  In most cases, the BOINC screen saver should still work properly.  If it does not, move BOINCManager back to the Applications folder.\
 \
-\
 \pard\pardeftab720\ql\qnatural
 \cf0 To completely remove (
 \f0\b uninstall
 \f1\b0 ) BOINC from your Macintosh:\
-\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural
-\ls1\ilvl0\cf0 	\'a5 Move the following files to the trash:\
-\pard\tx940\tx1440\pardeftab720\li1200\fi-1200\ql\qnatural
-\ls1\ilvl1\cf0 	\'a5 
-\f0\b BOINCManager.app
+\pard\tx720\pardeftab720\ql\qnatural
+\cf0 \'a5 There is no harm in leaving the "hidden" users 
+\f0\b boinc_master
+\f1\b0  and 
+\f0\b boinc_project
+\f1\b0  on your computer.  If you wish, you can remove them either by using the Applications/Utilities/NetInfo Manager application or by running the shell script 
+\f0\b Mac_SA_Insecure.sh
+\f1\b0 , which you can download from \
+	{\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/mac_build/Mac_SA_Insecure.sh"}}{\fldrslt http://boinc.berkeley.edu/mac_build/Mac_SA_Insecure.sh}}\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+\cf0 Note: this script must be run in the Terminal application 
+\f2\i before
+\f1\i0  deleting the 
+\f0\b BOINC Data
+\f1\b0  folder.\
+\pard\tx720\pardeftab720\ql\qnatural
+\cf0 \'a5 Move the following files to the trash:\
+\pard\tx220\tx720\tx1440\pardeftab720\li720\fi-720\ql\qnatural
+\ls1\ilvl0
+\f0\b \cf0 {\listtext	\'a5	}BOINCManager.app
 \f1\b0  (from your 
 \f0\b /Applications/
 \f1\b0  folder)\
-	\'a5 
-\f0\b BOINCSaver.saver
+\ls1\ilvl0
+\f0\b {\listtext	\'a5	}BOINCSaver.saver
 \f1\b0  (from your 
 \f0\b /Library/Screen Savers/
 \f1\b0  folder)\
-	\'a5 the 
+{\listtext	\'a5	}the 
 \f0\b BOINC Data/
 \f1\b0  folder (from your 
 \f0\b /Library/Applications Support/
 \f1\b0  folder)\
-	\'a5 
-\f0\b [username]/Library/Preferences/BOINC Manager Preferences
+\ls1\ilvl0
+\f0\b {\listtext	\'a5	}[username]/Library/Preferences/BOINC Manager Preferences
 \f1\b0 \
-\pard\tx220\tx720\pardeftab720\li400\fi-400\ql\qnatural
-\ls1\ilvl0\cf0 	\'a5 Open the 
+\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural
+\ls1\ilvl0\cf0 {\listtext	\'a5	}Open the 
 \f0\b Accounts
 \f1\b0  pane in the 
 \f0\b System Preferences
@@ -165,8 +179,7 @@ You can move (
 \f1\b0  (or 
 \f0\b Startup Items
 \f1\b0  under OS 10.3.)\
-\pard\tx220\tx720\pardeftab720\li360\fi-360\ql\qnatural
-\ls1\ilvl0\cf0 	\'a5 Open 
+{\listtext	\'a5	}Open 
 \f0\b System Preferences
 \f1\b0  from the Apple menu. Select 
 \f0\b Desktop & Screen Saver