diff --git a/configure.in b/configure.in
index 350778c58f..e839ee8f2e 100644
--- a/configure.in
+++ b/configure.in
@@ -84,6 +84,7 @@ src/null/Makefile \
 src/package/Makefile \
 src/packaging/MacOS/OpenAFS.Info.plist \
 src/packaging/MacOS/OpenAFS.info \
+src/packaging/MacOS/buildpkg.sh \
 src/packaging/RedHat/openafs.spec \
 src/pam/Makefile \
 src/pinstall/Makefile \
diff --git a/src/packaging/MacOS/DS_Store b/src/packaging/MacOS/DS_Store
index 646bda65aa..84fc18a276 100644
Binary files a/src/packaging/MacOS/DS_Store and b/src/packaging/MacOS/DS_Store differ
diff --git a/src/packaging/MacOS/ReadMe.rtf b/src/packaging/MacOS/ReadMe.rtf.8
similarity index 98%
rename from src/packaging/MacOS/ReadMe.rtf
rename to src/packaging/MacOS/ReadMe.rtf.8
index 120d3a22e7..ada1c7dd51 100644
--- a/src/packaging/MacOS/ReadMe.rtf
+++ b/src/packaging/MacOS/ReadMe.rtf.8
@@ -4,7 +4,7 @@
 \margl1440\margr1440\vieww9000\viewh9000\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\fs20 \cf0 This release of OpenAFS is targeted at MacOS 10.4.x. 
+\f0\fs20 \cf0 This release of OpenAFS is targeted at MacOS 10.4. (Tiger)
 \
 Select a client cell name by editing /var/db/openafs/etc/ThisCell\
 \
diff --git a/src/packaging/MacOS/ReadMe.rtf.9 b/src/packaging/MacOS/ReadMe.rtf.9
new file mode 100644
index 0000000000..dfba64d377
--- /dev/null
+++ b/src/packaging/MacOS/ReadMe.rtf.9
@@ -0,0 +1,13 @@
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf100
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh9000\viewkind0
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\fs20 \cf0 This release of OpenAFS is targeted at MacOS 10.5. (Leopard)
+\
+Select a client cell name by editing /var/db/openafs/etc/ThisCell\
+\
+The included afssettings program is distributed under the Apple Public Source License, version 2.0. See http://www.opensource.apple.com/apsl/2.0.txt or the included file 2.0.txt.\
+\
+Reboot when all of this is done.}
diff --git a/src/packaging/MacOS/afslogo.jpg b/src/packaging/MacOS/afslogo.jpg
index 9be23c2b39..e3fc7aa86f 100644
Binary files a/src/packaging/MacOS/afslogo.jpg and b/src/packaging/MacOS/afslogo.jpg differ
diff --git a/src/packaging/MacOS/background.jpg b/src/packaging/MacOS/background.jpg
index 6dd73eafad..c37ec24fda 100644
Binary files a/src/packaging/MacOS/background.jpg and b/src/packaging/MacOS/background.jpg differ
diff --git a/src/packaging/MacOS/buildpkg.sh b/src/packaging/MacOS/buildpkg.sh.in
similarity index 95%
rename from src/packaging/MacOS/buildpkg.sh
rename to src/packaging/MacOS/buildpkg.sh.in
index 4e924939f0..9c1e272dcd 100644
--- a/src/packaging/MacOS/buildpkg.sh
+++ b/src/packaging/MacOS/buildpkg.sh.in
@@ -25,6 +25,15 @@ CURDIR=`pwd`
 RESSRC=`dirname $0`
 RESSRC=`cd $RESSRC && pwd`
 majorvers=`uname -r | sed 's/\..*//'`
+if [ $majorvers -eq 7 ]; then
+  RELNAME="Panther"
+fi
+if [ $majorvers -eq 8 ]; then
+  RELNAME="Tiger"
+fi
+if [ $majorvers -eq 9 ]; then
+  RELNAME="Leopard"
+fi
 
 PKGROOT=$CURDIR/pkgroot
 PKGRES=$CURDIR/pkgres
@@ -67,7 +76,7 @@ if [ $firstpass = yes ]; then
           die=1
        fi
     fi
-    FILES="ReadMe.rtf License.rtf CellServDB.list OpenAFS.info OpenAFS.post_install OpenAFS.pre_upgrade csrvdbmerge.pl 2.0.txt"
+    FILES="ReadMe.rtf.$majorvers License.rtf CellServDB.list OpenAFS.info OpenAFS.post_install OpenAFS.pre_upgrade csrvdbmerge.pl 2.0.txt"
     for f in $FILES; do
        if [ ! -f $RESSRC/$f ]; then
 	 echo "file missing: " $RESSRC/$f
@@ -194,7 +203,8 @@ if [ $secondpass = yes ]; then
 	cp OpenAFS.post_install $PKGRES/OpenAFS.post_upgrade
 	chmod a+x $PKGRES/OpenAFS.post_install $PKGRES/OpenAFS.post_upgrade $PKGRES/OpenAFS.pre_upgrade
     fi
-    cp License.rtf ReadMe.rtf $PKGRES
+    cp License.rtf $PKGRES
+    cp ReadMe.rtf.$majorvers $PKGRES/ReadMe.rtf
     cp csrvdbmerge.pl $PKGRES
     chmod a+x $PKGRES/csrvdbmerge.pl
     cp CellServDB.list $PKGRES
@@ -236,7 +246,7 @@ if [ $secondpass = yes ]; then
     cp afslogo.jpg $CURDIR/dmg/.background
 #    hdiutil create -srcfolder $CURDIR/dmg -volname OpenAFS -anyowners $CURDIR/OpenAFS.dmg
     hdiutil makehybrid -hfs -hfs-volume-name OpenAFS -hfs-openfolder $CURDIR/dmg $CURDIR/dmg -o $CURDIR/TMP.dmg
-    hdiutil convert -format UDZO $CURDIR/TMP.dmg -o $CURDIR/OpenAFS.dmg
+    hdiutil convert -format UDZO $CURDIR/TMP.dmg -o $CURDIR/OpenAFS-@VERSION@-$RELNAME.dmg
     rm $CURDIR/TMP.dmg
     rm -rf $CURDIR/dmg
     # Unfortunately, sudo sets $USER to root, so I can't chown the