diff --git a/tools/build/stage b/tools/build/stage
index 773a77d6a..6ddf0bafd 100755
--- a/tools/build/stage
+++ b/tools/build/stage
@@ -198,7 +198,7 @@ esac
 
 [ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt
 
-[ -n "$PARTIAL" ] && SHOREWALLDIR=shorewall-common || SHOREWALLDIR=$SHOREWALL-${1}
+[ -n "$PARTIAL" -a -z "$UPLOADCOMMON" ]  && SHOREWALLDIR=shorewall-common || SHOREWALLDIR=$SHOREWALL-${1}
 
 cp $SHOREWALLDIR/releasenotes.txt releasenotes.txt
 
diff --git a/tools/build/upload b/tools/build/upload
index fefada609..16d913475 100755
--- a/tools/build/upload
+++ b/tools/build/upload
@@ -194,7 +194,7 @@ fi
 
 [ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt
 
-[ -n "$PARTIAL" ] && SHOREWALLDIR=shorewall-common || SHOREWALLDIR=$SHOREWALL-${1}
+[ -n "$PARTIAL" -a -z "$UPLOADCOMMON" ]  && SHOREWALLDIR=shorewall-common || SHOREWALLDIR=$SHOREWALL-${1}
 
 cp $SHOREWALLDIR/releasenotes.txt releasenotes.txt