diff --git a/packaging/checkout-and-build.sh b/packaging/checkout-and-build.sh
index 5e0a78a3ce..4ea5a3d507 100755
--- a/packaging/checkout-and-build.sh
+++ b/packaging/checkout-and-build.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
-ARGS=3
+ARGS=1
 E_BADARGS=85
 
 if [ $# -ne "$ARGS" ]; then
-  echo "Usage: `basename $0` tag username password"
+  echo "Usage: `basename $0` tag"
   exit $E_BADARGS
 fi
 
@@ -61,7 +61,7 @@ fi
 
 ./package-all.sh $TAG ~/openra-package/packages/
 
-./upload-all.sh $TAG ~/openra-package/packages $2 $3
+./upload-all.sh $TAG ~/openra-package/packages
 
 popd &> /dev/null # packaging
 popd &> /dev/null # $_gitname-build
diff --git a/packaging/upload-all.sh b/packaging/upload-all.sh
index 46e9381c88..ab51c6ba0d 100755
--- a/packaging/upload-all.sh
+++ b/packaging/upload-all.sh
@@ -10,17 +10,17 @@ LINUXVERSION=`echo $TAG | sed "s/-/\\./g"`
 FTPPATHBASE="openra.res0l.net"
 FTPPATH="$FTPPATHBASE/assets/downloads"
 
-./uploader.sh windows $PKGDIR/OpenRA-$TAG.exe "$FTPSERVER" "$FTPPATH" "$3" "$4"
-./uploader.sh mac $PKGDIR/OpenRA-$TAG.zip "$FTPSERVER" "$FTPPATH" "$3" "$4"
-./uploader.sh linux/deb $PKGDIR/openra_${LINUXVERSION}_all.deb "$FTPSERVER" "$FTPPATH" "$3" "$4"
+./uploader.sh windows $PKGDIR/OpenRA-$TAG.exe "$FTPSERVER" "$FTPPATH"
+./uploader.sh mac $PKGDIR/OpenRA-$TAG.zip "$FTPSERVER" "$FTPPATH"
+./uploader.sh linux/deb $PKGDIR/openra_${LINUXVERSION}_all.deb "$FTPSERVER" "$FTPPATH"
 
 mv $PKGDIR/openra-$LINUXVERSION-1.noarch.rpm $PKGDIR/openra-$TYPE$VERSION-1.noarch.rpm
-./uploader.sh linux/rpm $PKGDIR/openra-$TYPE$VERSION-1.noarch.rpm "$FTPSERVER" "$FTPPATH" "$3" "$4"
+./uploader.sh linux/rpm $PKGDIR/openra-$TYPE$VERSION-1.noarch.rpm "$FTPSERVER" "$FTPPATH"
 mv $PKGDIR/openra-$LINUXVERSION-1-any.pkg.tar.xz $PKGDIR/openra-$TYPE$VERSION-1-any.pkg.tar.xz
-./uploader.sh linux/arch $PKGDIR/openra-$TYPE$VERSION-1-any.pkg.tar.xz "$FTPSERVER" "$FTPPATH" "$3" "$4"
+./uploader.sh linux/arch $PKGDIR/openra-$TYPE$VERSION-1-any.pkg.tar.xz "$FTPSERVER" "$FTPPATH"
 
 if [ "$TYPE" = "release" ]; then
-    wput --basename=../ -u ../VERSION ftp://$3:$4@$FTPSERVER/$FTPPATHBASE/master/
+    wput --basename=../ -u ../VERSION ftp://$FTPSERVER/$FTPPATHBASE/master/
 fi
 
 wget http://$FTPSERVER/home/syncdownloads
diff --git a/packaging/uploader.sh b/packaging/uploader.sh
index 78bddd85d4..0745178925 100755
--- a/packaging/uploader.sh
+++ b/packaging/uploader.sh
@@ -7,7 +7,7 @@ FILENAME=$2
 FTPSERVER=$3
 FTPPATH=$4
 
-FTP="ftp://$5:$6@${FTPSERVER}/${FTPPATH}/${PLATFORM}/"
+FTP="ftp://${FTPSERVER}/${FTPPATH}/${PLATFORM}/"
 
 if [ ! -e "${FILENAME}" ]; then
 	echo "File not found: ${FILENAME}"