diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index d8176b977..74c51c135 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -352,34 +352,47 @@ progress_message "Distribution directory is $DIR"
 
 cd $DIR
 
+[ -n "$BUILDCOMMON" ] && SHOREWALLDIR=shorewall-common-${VERSION} || SHOREWALLDIR=shorewall-common
+SHOREWALLLITEDIR=shorewall-lite-${VERSION}
+TARBALL=shorewall-common-${VERSION}.tgz
+LITETARBALL=shorewall-lite-${VERSION}.tgz
+LITETARBALL=shorewall-lite-${VERSION}.tgz
+SHELLTARBALL=shorewall-shell-${VERSION}.tgz
+SHELLDIR=shorewall-shell-${VERSION}
+PERLTARBALL=shorewall-perl-${BASEVERSION}.tgz
+PERLDIR=shorewall-perl-${BASEVERSION}
+
 case $VERSION in
     *Beta*|*RC*|*Pre*)
 	#
 	# Beta or Release Candidate
 	#
 	BASEVERSION=${VERSION%-*}
+	RPMNAME=shorewall-common-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
+	LITERPMNAME=shorewall-lite-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
+	PERLRPMNAME=shorewall-perl-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
+	SHELLRPMNAME=shorewall-shell-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
 	;;
     *.*.*.*)
         #
         # Patch Release
         #
-	BASEVERSION=${VERSION%-*}
+        RPMNAME=shorewall-common-${BASEVERSION}-${PATCHNUM}.noarch.rpm
+        LITERPMNAME=shorewall-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm
+        PERLRPMNAME=shorewall-perl-${BASEVERSION}-${PATCHNUM}.noarch.rpm
+        SHELLRPMNAME=shorewall-shell-${BASEVERSION}-${PATCHNUM}.noarch.rpm
+        ;;
+     *)
+	#
+	# Normal Release
+	#
+	RPMNAME=shorewall-common-${VERSION}-0base.noarch.rpm
+	LITERPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm
+	PERLRPMNAME=shorewall-perl-${VERSION}-0base.noarch.rpm
+	SHELLRPMNAME=shorewall-shell-${VERSION}-0base.noarch.rpm
 	;;
 esac
 
-[ -n "$BUILDCOMMON" ] && SHOREWALLDIR=shorewall-common-${VERSION} || SHOREWALLDIR=shorewall-common
-SHOREWALLLITEDIR=shorewall-lite-$VERSION
-TARBALL=shorewall-common-$VERSION.tgz
-LITETARBALL=shorewall-lite-$VERSION.tgz
-RPMNAME=shorewall-common-${VERSION}-0base.noarch.rpm
-LITERPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm
-PERLRPMNAME=shorewall-perl-${VERSION}-0base.noarch.rpm
-PERLDIR=shorewall-perl-$VERSION
-PERLTARBALL=shorewall-perl-$VERSION.tgz
-SHELLRPMNAME=shorewall-shell-${VERSION}-0base.noarch.rpm
-SHELLDIR=shorewall-shell-$VERSION
-SHELLTARBALL=shorewall-shell-$VERSION.tgz
-
 HTMLDIR=shorewall-docs-html-$VERSION
 
 if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then