diff --git a/packaging/osx/package-game.sh b/packaging/osx/package-game.sh
index 07a4c6f68c..ffe531ddb8 100755
--- a/packaging/osx/package-game.sh
+++ b/packaging/osx/package-game.sh
@@ -3,14 +3,13 @@
 #    Packages game files into the launcher app
 #    previously created by the package-launcher script
 
-PWD=`pwd`
-PACKAGING_PATH="$PWD/osxbuild"
-SOURCE_PATH="$PWD/."
-BUNDLE_PATH="$SOURCE_PATH/packaging/osx/OpenRA.app"
+PACKAGING_PATH="$1/osxbuild"
+SOURCE_PATH="$1"
+BUNDLE_PATH="OpenRA.app"
 TARGET_PATH="$PACKAGING_PATH/OpenRA.app/Contents/Resources"
 
 FILES="OpenRA.Game.exe OpenRA.Gl.dll OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf shaders mods/ra mods/cnc"
-EXCLUDE="*.mdb ./mods/cnc/packages/*.mix ./mods/ra/packages/*.mix  ./mods/cnc/packages/*.MIX ./mods/ra/packages/*.MIX"
+EXCLUDE="*.mdb"
 
 # Copy source files into packaging dir
 mkdir -p $PACKAGING_PATH
@@ -18,7 +17,7 @@ cp -r "$BUNDLE_PATH" "$PACKAGING_PATH/OpenRA.app"
 mkdir -p "$TARGET_PATH/mods"
 
 for i in $FILES; do
-	cp -R "$i" "$TARGET_PATH/$i"
+	cp -R "$SOURCE_PATH/$i" "$TARGET_PATH/$i"
 done
 
 # Delete unwanted files
@@ -29,5 +28,5 @@ done
 
 git describe --tags > "VERSION"
 cd $PACKAGING_PATH
-zip OpenRA -r -9 OpenRA.app 
-echo "Done!"
\ No newline at end of file
+zip OpenRA-$2 -r -9 OpenRA.app 
+echo "Done!"
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index 03d4e43025..d9bad66f8d 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -34,13 +34,15 @@ popd
 popd
 
 pushd linux/pkgbuild/
-sh buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSION"
+#sh buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSION"
 popd
 
 pushd linux/rpm/
-sh buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSION" ~/rpmbuild
+#sh buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSION" ~/rpmbuild
 popd
 
 pushd osx/
-#todo
+sh package-game.sh ~/openra-package/$_gitname-build "$VERSION"
 popd
+
+sh uploader.sh osx "$VERSION" ~/openra-package/$_gitname-build/osxbuild/OpenRA-$VERSION.zip "$2" "$3"
diff --git a/packaging/uploader.sh b/packaging/uploader.sh
index 776d52f80c..591154bd2b 100755
--- a/packaging/uploader.sh
+++ b/packaging/uploader.sh
@@ -6,21 +6,22 @@
 PLATFORM=$1
 VERSION=$2
 FILENAME=$3
-FTP="ftp://openra@open-ra.org/httpdocs/releases/${PLATFORM}/"
+
+FTP="ftp://$4:$5@ftp.open-ra.org/httpdocs/releases/${PLATFORM}/"
 
 if [ ! -e "${FILENAME}" ]; then
 	echo "File not found: ${FILENAME}"
 	exit 1
 fi
 
-SIZE=`ls -lh "${FILENAME}" | awk '{ print $5 }'`B
-echo "{\n\t\"version\":\"${VERSION}\",\n\t\"size\":\"${SIZE}\"\n}" > version.json
-echo `basename ${FILENAME}` > latest.txt
+SIZE=`stat -c "%s" ${FILENAME}`B
+echo "{\n\t\"version\":\"${VERSION}\",\n\t\"size\":\"${SIZE}\"\n}" > /tmp/version.json
+echo `basename ${FILENAME}` > /tmp/latest.txt
 
-ftp "${FTP}" <<EOT
-pwd
-put "${FILENAME}" "`basename ${FILENAME}`"
-put version.json
-put latest.txt
-quit
-EOT
+pushd `dirname ${FILENAME}`
+wput "${FTP}" "`basename ${FILENAME}`"
+popd
+pushd /tmp/
+wput "${FTP}" version.json
+wput "${FTP}" latest.txt
+popd