diff --git a/packaging/checkout-and-build.sh b/packaging/checkout-and-build.sh
index 6c020cbac7..08f1b3921c 100755
--- a/packaging/checkout-and-build.sh
+++ b/packaging/checkout-and-build.sh
@@ -61,7 +61,7 @@ fi
 
 ./package-all.sh $VERSION ~/openra-package/packages/
 
-./upload-all.sh $TAG ~/openra-package/packages/
+./upload-all.sh $TAG ~/openra-package/packages $2 $3
 
 popd &> /dev/null # packaging
 popd &> /dev/null # $_gitname-build
diff --git a/packaging/upload-all.sh b/packaging/upload-all.sh
index dc26ffb205..c71891958c 100755
--- a/packaging/upload-all.sh
+++ b/packaging/upload-all.sh
@@ -20,14 +20,14 @@ case "$TYPE" in
         ;;
 esac
 
-./uploader.sh windows "$VERSION" $PKGDIR/OpenRA-$VERSION.exe "latest" "$FTPPATH" "$3" "$4"
-./uploader.sh mac "$VERSION" $PKGDIR/OpenRA-$VERSION.zip "latest" "$FTPPATH" "$3" "$4"
+./uploader.sh windows "$VERSION" $PKGDIR/OpenRA-$VERSION.exe "latest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
+./uploader.sh mac "$VERSION" $PKGDIR/OpenRA-$VERSION.zip "latest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
 
 LINUXVERSION=`echo $VERSION | sed "s/-/\\./g"`
 
-./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION.deb "deblatest" "$FTPPATH" "$3" "$4"
-./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1.noarch.rpm "rpmlatest" "$FTPPATH" "$3" "$4"
-./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1-any.pkg.tar.xz "archlatest" "$FTPPATH" "$3" "$4"
+./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION.deb "deblatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
+./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1.noarch.rpm "rpmlatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
+./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1-any.pkg.tar.xz "archlatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
 
 if [ "$TYPE" = "release" ]; then
     wput --basename=../ -u ../VERSION ftp://$3:$4@$FTPSERVER/$FTPPATHBASE/master/
diff --git a/packaging/uploader.sh b/packaging/uploader.sh
index 1ad6dc38a7..e001fd2b2f 100755
--- a/packaging/uploader.sh
+++ b/packaging/uploader.sh
@@ -6,9 +6,10 @@ PLATFORM=$1
 VERSION=$2
 FILENAME=$3
 LATESTNAME=$4
-FTPPATH=$5
+FTPSERVER=$5
+FTPPATH=$6
 
-FTP="ftp://$6:$7@${FTPSERVER}/${FTPPATH}/${PLATFORM}/"
+FTP="ftp://$7:$8@${FTPSERVER}/${FTPPATH}/${PLATFORM}/"
 
 if [ ! -e "${FILENAME}" ]; then
 	echo "File not found: ${FILENAME}"