diff --git a/checkin_notes b/checkin_notes
index 018071f2ad..39e4595af7 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7075,7 +7075,6 @@ David  19 Aug 2009
     py/Boinc/
         setup_project.py
 
-
 Eric K 20 Aug 2009
     - Moved credit.cpp into to the scheduler library
     - Added a separate GPU memory requirement for the CUDA23 plan
@@ -7084,3 +7083,12 @@ Eric K 20 Aug 2009
         sched_customize.cpp
         sched_customize.h
 
+Charlie 21 Aug 2009
+    - Mac: Add x86_64 screensaver for Snow Leopard OS 10.6.
+        Note: OS 10.6 is not yet released, so I am building the x86_64 
+        screensaver separately using a beta version of OS 10.6 and its 
+        development tools, then merging it into the current build, so 
+        this change is to the release script.
+    
+    mac_installer/
+        release_boinc.sh
diff --git a/mac_installer/release_boinc.sh b/mac_installer/release_boinc.sh
index 2104e7677d..9ce8b63d12 100644
--- a/mac_installer/release_boinc.sh
+++ b/mac_installer/release_boinc.sh
@@ -19,7 +19,7 @@
 
 ##
 # Release Script for Macintosh BOINC Manager 10/31/07 by Charlie Fenton
-## updated 6/19/09 by Charlie Fenton
+## updated 8/21/09 by Charlie Fenton for OS 10.6 Snow Leopard screen saver
 ##
 ## NOTE: This script uses PackageMaker, which is installed as part of the 
 ##   XCode developer tools.  So you must have installed XCode Developer 
@@ -125,6 +125,18 @@ cp -fpR $BUILDPATH/BOINCManager.app ../BOINC_Installer/Pkg_Root/Applications/
 
 cp -fpR $BUILDPATH/BOINCSaver.saver ../BOINC_Installer/Pkg_Root/Library/Screen\ Savers/
 
+## If x86_64 version of screen saver for OS 10.6 exists, merge it into our screen saver
+if [ -x ../_boinc_SnowLeopard/mac_build/build/Deployment/BOINCSaver.saver/Contents/MacOS/BOINCSaver ]; then
+    if [ "$4" != "-dev" ]; then
+        rm -f ../BOINC_Installer/Pkg_Root/Library/Screen\ Savers/BOINCSaver.saver/Contents/MacOS/BOINCSaver
+        rm -fR ../BOINC_Installer/temp/
+        mkdir -p ../BOINC_Installer/temp/
+        lipo ../_boinc_SnowLeopard/mac_build/build/Deployment/BOINCSaver.saver/Contents/MacOS/BOINCSaver -thin x86_64 -output ../BOINC_Installer/temp/saver64
+        lipo ../BOINC_Installer/temp/saver64 $BUILDPATH/BOINCSaver.saver/Contents/MacOS/BOINCSaver -create -output ../BOINC_Installer/Pkg_Root/Library/Screen\ Savers/BOINCSaver.saver/Contents/MacOS/BOINCSaver
+        rm -fR ../BOINC_Installer/temp/
+    fi
+fi
+
 ## Copy the localization files into the installer tree
 ## Old way copies CVS and *.po files which are not needed
 ## cp -fpR locale/ ../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data/locale