diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index 2428b11b4..00b53ccab 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -246,7 +246,6 @@ case $VERSION in
 	MANPAGETAG=trunk/manpages
 	LITEMANPAGETAG=trunk/manpages-lite
 	;;
-case $VERSION in
      4.0.*)
 	SVNBRANCH="trunk/Shorewall-common"
 	LITESVNBRANCH="trunk/Shorewall-lite"
diff --git a/tools/build/stage b/tools/build/stage
index c9c7fc38e..40b6fb010 100755
--- a/tools/build/stage
+++ b/tools/build/stage
@@ -8,6 +8,13 @@ shelldir=
 DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/staging//shorewall-$1"
 
 case $1 in
+    4.*Beta*|4.*RC*)
+	DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
+	rpm=shorewall-${1%-*}-0{1#*-}.noarch.rpm
+	literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
+	perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm
+	shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm
+	;;
     3.9.*)
 	DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
 	rpm=shorewall-${1}-1.noarch.rpm
diff --git a/tools/build/upload b/tools/build/upload
index c2863d20a..048baa629 100755
--- a/tools/build/upload
+++ b/tools/build/upload
@@ -6,6 +6,13 @@ perlrpm=
 shellrpm=
 
 case $1 in
+    4.*Beta*|4.*RC*)
+	DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
+	rpm=shorewall-${1%-*}-0{1#*-}.noarch.rpm
+	literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
+	perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm
+	shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm
+	;;
     3.9.*)
 	DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
 	rpm=shorewall-${1}-1.noarch.rpm