diff --git a/tools/build/stage b/tools/build/stage
index 679d422e0..16ee7eace 100755
--- a/tools/build/stage
+++ b/tools/build/stage
@@ -185,15 +185,16 @@ else
 	DEST=${USER}:${DEST}
 fi
 
-[ -n "$UPLOADPERL" ]   && files="$files shorewall-perl-${1}.* $perlrpm"
-[ -n "$UPLOADCOMMON" ] && files="$files shorewall-common-${1}.* $rpm"
-[ -n "$UPLOADSHELL" ]  && files="$files shorewall-shell-${1}.* $shellrpm"
-[ -n "$UPLOADLITE" ]   && files="$files shorewall-lite-${1}.* $literpm"
-[ -n "$UPLOADXML" ]    && files="$files shorewall-docs-xml-${1}.* $literpm"
-[ -n "$UPLOADHTML" ]   && files="$files shorewall-docs-html-${1}.* $literpm"
+files="errata known_problems.txt releasenotes.txt patch-$1 ${1}.*"
+base=
 
-[ -n "$BASE" ] && $COMMAND $files $DEST/base
+[ -n "$UPLOADPERL" ]   && base="shorewall-perl-${1}.tar.*" && files="$files shorewall-perl-${1}. $perlrpm"
+[ -n "$UPLOADCOMMON" ] && base="$base shorewall-common-${1}.tar.*" && files="$files shorewall-common-${1}.* $rpm"
+[ -n "$UPLOADSHELL" ]  && base="$base shorewall-shell-${1}.tar.*" && files="$files shorewall-shell-${1}.* $shellrpm"
+[ -n "$UPLOADLITE" ]   && base="$base shorewall-lite-${1}.tar.*" && files="$files shorewall-lite-${1}.* $literpm"
+[ -n "$UPLOADXML" ]    && base="$base shorewall-docs-xml-${1}.tar.*" && files="$files shorewall-docs-xml-${1}.* $literpm"
+[ -n "$UPLOADHTML" ]   && base="$base shorewall-docs-html-${1}.tar.*" && files="$files shorewall-docs-html-${1}.* $literpm"
 
-files="errata known_problems.txt releasenotes.txt patch-$1 ${1}.* $files"
+[ -n "$BASE" ] && $COMMAND $base $DEST/base
 
 $COMMAND -r $files $DEST
diff --git a/tools/build/upload b/tools/build/upload
index f55a4d709..8af226997 100755
--- a/tools/build/upload
+++ b/tools/build/upload
@@ -189,15 +189,16 @@ else
 	DEST=${USER}:${DEST}
 fi
 
-[ -n "$UPLOADPERL" ]   && files="$files shorewall-perl-${1}.* $perlrpm"
-[ -n "$UPLOADCOMMON" ] && files="$files shorewall-common-${1}.* $rpm"
-[ -n "$UPLOADSHELL" ]  && files="$files shorewall-shell-${1}.* $shellrpm"
-[ -n "$UPLOADLITE" ]   && files="$files shorewall-lite-${1}.* $literpm"
-[ -n "$UPLOADXML" ]    && files="$files shorewall-docs-xml-${1}.* $literpm"
-[ -n "$UPLOADHTML" ]   && files="$files shorewall-docs-html-${1}.* $literpm"
+files="errata known_problems.txt releasenotes.txt patch-$1 ${1}.*"
+base=
 
-[ -n "$BASE" ] && $COMMAND $files $DEST/base
+[ -n "$UPLOADPERL" ]   && base="shorewall-perl-${1}.tar.*" && files="$files shorewall-perl-${1}. $perlrpm"
+[ -n "$UPLOADCOMMON" ] && base="$base shorewall-common-${1}.tar.*" && files="$files shorewall-common-${1}.* $rpm"
+[ -n "$UPLOADSHELL" ]  && base="$base shorewall-shell-${1}.tar.*" && files="$files shorewall-shell-${1}.* $shellrpm"
+[ -n "$UPLOADLITE" ]   && base="$base shorewall-lite-${1}.tar.*" && files="$files shorewall-lite-${1}.* $literpm"
+[ -n "$UPLOADXML" ]    && base="$base shorewall-docs-xml-${1}.tar.*" && files="$files shorewall-docs-xml-${1}.* $literpm"
+[ -n "$UPLOADHTML" ]   && base="$base shorewall-docs-html-${1}.tar.*" && files="$files shorewall-docs-html-${1}.* $literpm"
 
-files="errata known_problems.txt releasenotes.txt patch-$1 ${1}.* $files"
+[ -n "$BASE" ] && $COMMAND $base $DEST/base
 
 $COMMAND -r $files $DEST