diff --git a/tools/build/upload b/tools/build/upload
index 0426faf62..d955d778d 100755
--- a/tools/build/upload
+++ b/tools/build/upload
@@ -8,18 +8,17 @@ case $1 in
 	;;
     *Beta*|*RC*)
 	DEST="root@mail.shorewall.net:/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1%-*}-0${1#*-}\*
+	rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm
 	;;
     *)
 	DEST="root@mail.shorewall.net:/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1"
 	;;
 esac
 
-usage() { echo "$0: <version>"; }
-
-[ $# -eq 1 ] || usage
+[ $# -eq 1 ] || { echo "Usage: $(basename $0) <version>"; exit 2; }
 
 [ -d errata ] || mkdir errata
+
 echo "There are no known problems in Shorewall version $1" > known_problems.txt
 
-scp -r errata known_problems.txt patch-$1 ${1}.* shorewall-${1}/releasenotes.txt shorewall-${1}-[0-1]* shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $DEST
+scp -r errata known_problems.txt patch-$1 ${1}.* shorewall-${1}/releasenotes.txt shorewall-${1}-1* shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $DEST