5 files changed, 19 insertions, 4 deletions
diff --git a/contrib/osx/Makefile.am b/contrib/osx/Makefile.am
index 9bde37f3e7..7ece75537c 100644
--- a/contrib/osx/Makefile.am
+++ b/contrib/osx/Makefile.am
@@ -6,4 +6,4 @@ EXTRA_DIST = PrivoxyConfDesc.plist PrivoxyConfInfo.plist    \
     TorInfo.plist.in TorStartupDesc.plist.in TorStartupInfo.plist            \
     package.sh privoxy.config TorPostflight addsysuser 	\
     Tor_Uninstaller.applescript uninstall_tor_bundle.sh tor-resolve.pdf \
-    tor-reference.pdf
+    tor-reference.pdf package_list.txt
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index 037237eb42..d1efd726cc 100644
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -68,7 +68,21 @@ if [ -d /Library/StartupItems/Privoxy ]; then
 fi
 
 # Copy Documentation
-cp -r $PACKAGE_PATH/Contents/Resources/documents $TARGET/documents
+if [ -d $PACKAGE_PATH/Contents/Resources/documents ];then
+   cp -r $PACKAGE_PATH/Contents/Resources/documents $TARGET/documents
+fi
 
 # Copy Uninstaller
-cp -r $PACKAGE_PATH/Contents/Resources/*ninstall* $TARGET/
+if [ -f $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.applescript ]; then 
+   cp $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.applescript $TARGET/Tor_Uninstaller.applescript
+   chmod 755 $TARGET/Tor_Uninstaller.applescript
+fi
+
+if [ -f $PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh ]; then
+   cp $PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh $TARGET/uninstall_tor_bundle.sh
+   chmod 755 $TARGET/uninstall_tor_bundle.sh
+fi
+
+if [ -f $PACKAGE_PATH/Contents/Resources/package_list.txt ]; then
+   cp $PACKAGE_PATH/Contents/Resources/package_list.txt $TARGET/package_list.txt
+fi
diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
index e88be19c63..414a1c7b07 100644
--- a/contrib/osx/package.sh
+++ b/contrib/osx/package.sh
@@ -79,6 +79,7 @@ cp contrib/osx/TorPostflight $BUILD_DIR/tor_resources/postflight
 cp contrib/osx/addsysuser $BUILD_DIR/tor_resources/addsysuser
 cp contrib/osx/Tor_Uninstaller.applescript $BUILD_DIR/tor_resources/Tor_Uninstaller.applescript
 cp contrib/osx/uninstall_tor_bundle.sh $BUILD_DIR/tor_resources/uninstall_tor_bundle.sh
+cp contrib/osx/package_list.txt $BUILD_DIR/tor_resources/package_list.txt
 cp contrib/osx/tor_logo.gif $BUILD_DIR/tor_resources/background.gif
 cat <<EOF > $BUILD_DIR/tor_resources/Welcome.txt
 Tor: an anonymous Internet communication system
diff --git a/contrib/osx/package_list.txt b/contrib/osx/package_list.txt
index abd667382f..2a21295f13 100644
--- a/contrib/osx/package_list.txt
+++ b/contrib/osx/package_list.txt
@@ -2,4 +2,3 @@ Tor
 Privoxy
 torstartup
 privoxyconf
-toruninstaller
diff --git a/contrib/osx/uninstall_tor_bundle.sh b/contrib/osx/uninstall_tor_bundle.sh
index 14a95e6188..9d69d09e54 100755
--- a/contrib/osx/uninstall_tor_bundle.sh
+++ b/contrib/osx/uninstall_tor_bundle.sh
@@ -134,6 +134,7 @@ niutil -destroy . /users/$TOR_USER
 ## clean up
 echo ". Cleaning up"
 rm -rf $TEMP_BOM_CONTENTS
+rm -rf /Library/Privoxy/ /Library/StartupItems/Tor/ /Library/StartupItems/Privoxy/ /Library/Tor/
 
 echo ". Finished"