diff --git a/checkin_notes b/checkin_notes
index 537e973629..91f92eaf41 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8247,7 +8247,7 @@ David  20 Nov 2010
     sched/
         start
 
-Charlie 19 Nov 2010
+Charlie 22 Nov 2010
     - Mac Installer: It turns out that the command-line installer clears all 
         environment variables, so instead of checking environment variables  
         during command-line installs, we check for the existence of files 
@@ -8280,3 +8280,12 @@ David  22 Nov 2010
 
 	client/
 		work_fetch.cpp
+
+Charlie 22 Nov 2010
+    - Mac Installer: Better handling of custom installer icon.
+    
+    clientgui/
+        res/
+            MacPkgIcon.zip
+    mac_installer/
+        release_boinc.sh
diff --git a/clientgui/res/MacPkgIcon.zip b/clientgui/res/MacPkgIcon.zip
index aef9f780ad..526e35e475 100644
Binary files a/clientgui/res/MacPkgIcon.zip and b/clientgui/res/MacPkgIcon.zip differ
diff --git a/mac_installer/release_boinc.sh b/mac_installer/release_boinc.sh
index 35e0ef9c4b..851003ff67 100644
--- a/mac_installer/release_boinc.sh
+++ b/mac_installer/release_boinc.sh
@@ -21,7 +21,7 @@
 # Release Script for Macintosh BOINC Manager 10/31/07 by Charlie Fenton
 ## updated 11/18/09 by Charlie Fenton for OS 10.6 Snow Leopard
 ## updated 9/28/10 by Charlie Fenton for new BOINC skins
-## updated 11/18/10 by Charlie Fenton to remove obsolete items
+## updated 11/23/10 by Charlie Fenton to remove obsolete items
 ##
 ## NOTE: This script uses PackageMaker, which is installed as part of the 
 ##   XCode developer tools.  So you must have installed XCode Developer 
@@ -202,13 +202,9 @@ DarwinMajorVersion=`echo $DarwinVersion | sed 's/\([0-9]*\)[.].*/\1/' `;
 sudo rm -f ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/BOINC\ Installer.pkg/Contents/Resources/TokenDefinitions.plist
 defaults delete "$BOINCPath/../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/BOINC Installer.pkg/Contents/Info" IFPkgPathMappings
 # Add our custom icon
-cp -fpR clientgui/res/MacPkgIcon.zip ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/BOINC\ Installer.pkg/
-open ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/BOINC\ Installer.pkg/MacPkgIcon.zip
-# Give the open command time to unzip the icon file
-sleep 5
-rm -f ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/BOINC\ Installer.pkg/MacPkgIcon.zip
+ditto -xk clientgui/res/MacPkgIcon.zip ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/BOINC\ Installer.pkg/
 SetFile -a CE "$BOINCPath/../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/BOINC Installer.pkg"
-# SetFile -a V "$BOINCPath/../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/BOINC Installer.pkg/"Icon*
+SetFile -a V "$BOINCPath/../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/BOINC Installer.pkg/"Icon*
 
 # Build the stand-alone client distribution
 cp -fpR mac_build/Mac_SA_Insecure.sh ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_universal-apple-darwin/
@@ -236,9 +232,10 @@ sudo chmod -R u+rw-s,g+r-ws,o+r-w ../BOINC_Installer/New_Release_$1_$2_$3/boinc_
 cp -fpR $BUILDPATH/SymbolTables/ ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_SymbolTables/
 
 cd ../BOINC_Installer/New_Release_$1_$2_$3
-zip -rqy boinc_$1.$2.$3_macOSX_universal.zip boinc_$1.$2.$3_macOSX_universal
-zip -rqy boinc_$1.$2.$3_universal-apple-darwin.zip boinc_$1.$2.$3_universal-apple-darwin
-zip -rqy boinc_$1.$2.$3_macOSX_SymbolTables.zip boinc_$1.$2.$3_macOSX_SymbolTables
+## Use ditto instead of zip utility to preserve resource forks and Finder attributes (custom icon, hide extension) 
+ditto -ck boinc_$1.$2.$3_macOSX_universal boinc_$1.$2.$3_macOSX_universal.zip
+ditto -ck boinc_$1.$2.$3_universal-apple-darwin boinc_$1.$2.$3_universal-apple-darwin.zip
+ditto -ck boinc_$1.$2.$3_macOSX_SymbolTables boinc_$1.$2.$3_macOSX_SymbolTables.zip
 
 #popd
 cd "${BOINCPath}"