diff --git a/tools/build/stage b/tools/build/stage
index db6f0d0b1..22ac19371 100755
--- a/tools/build/stage
+++ b/tools/build/stage
@@ -138,19 +138,19 @@ case $1 in
     4.0.*)
 	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
 	SHOREWALL=shorewall-common
-	rpm=shorewall-common-${1}-1.noarch.rpm
-	literpm=shorewall-lite-${1}-1.noarch.rpm
-	perlrpm=shorewall-perl-${1}-1.noarch.rpm
-	shellrpm=shorewall-shell-${1}-1.noarch.rpm
+	rpm=shorewall-common-${1}-0base.noarch.rpm
+	literpm=shorewall-lite-${1}-0base.noarch.rpm
+	perlrpm=shorewall-perl-${1}-0base.noarch.rpm
+	shellrpm=shorewall-shell-${1}-0base.noarch.rpm
 	BASE=Yes
 	;;
-    4.1.*)
+    4.[12].*)
 	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
 	SHOREWALL=shorewall-common
-	rpm=shorewall-common-${1}-1.noarch.rpm
-	literpm=shorewall-lite-${1}-1.noarch.rpm
-	perlrpm=shorewall-perl-${1}-1.noarch.rpm
-	shellrpm=shorewall-shell-${1}-1.noarch.rpm
+	rpm=shorewall-common-${1}-0base.noarch.rpm
+	literpm=shorewall-lite-${1}-0base.noarch.rpm
+	perlrpm=shorewall-perl-${1}-0base.noarch.rpm
+	shellrpm=shorewall-shell-${1}-0base.noarch.rpm
 	BASE=Yes
 	;;
     3.*[13579].*)
diff --git a/tools/build/upload b/tools/build/upload
index 2b59cd287..a43014253 100755
--- a/tools/build/upload
+++ b/tools/build/upload
@@ -138,13 +138,13 @@ case $1 in
     4.0.*)
 	DEST="/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1"
 	SHOREWALL=shorewall-common
-	rpm=shorewall-common-${1}-1.noarch.rpm
-	literpm=shorewall-lite-${1}-1.noarch.rpm
-	perlrpm=shorewall-perl-${1}-1.noarch.rpm
-	shellrpm=shorewall-shell-${1}-1.noarch.rpm
+	rpm=shorewall-common-${1}-0base.noarch.rpm
+	literpm=shorewall-lite-${1}-0base.noarch.rpm
+	perlrpm=shorewall-perl-${1}-0base.noarch.rpm
+	shellrpm=shorewall-shell-${1}-0base.noarch.rpm
 	BASE=Yes
 	;;
-    4.1.*.*)
+    4.[12].*.*)
 	BASEVERSION=${1%.*}
 	PATCHNUM=${1##*.}
 	DEST="/srv/ftp/pub/shorewall/development/${BASEVERSION%.*}/shorewall-${BASEVERSION}"
@@ -154,13 +154,13 @@ case $1 in
 	perlrpm=shorewall-perl-${BASEVERSION}-${PATCHNUM}.noarch.rpm
 	shellrpm=shorewall-shell-${BASEVERSION}-${PATCHNUM}.noarch.rpm
 	;;
-    4.1.*)
+    4.[12].*)
 	DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
 	SHOREWALL=shorewall-common
-	rpm=shorewall-common-${1}-1.noarch.rpm
-	literpm=shorewall-lite-${1}-1.noarch.rpm
-	perlrpm=shorewall-perl-${1}-1.noarch.rpm
-	shellrpm=shorewall-shell-${1}-1.noarch.rpm
+	rpm=shorewall-common-${1}-0base.noarch.rpm
+	literpm=shorewall-lite-${1}-0base.noarch.rpm
+	perlrpm=shorewall-perl-${1}-0base.noarch.rpm
+	shellrpm=shorewall-shell-${1}-0base.noarch.rpm
 	BASE=Yes
 	;;
     3.*[13579].*)