diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index c3e4cd22d..938e9f13b 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -301,6 +301,7 @@ case $VERSION in
 	SAMPLESTAG="tags/${BASEVERSION}/Samples"
 	MANPAGETAG=="tags/${BASEVERSION}/manpages"
 	LITEMANPAGETAG="tags/${BASEVERSION}/manpages-lite"
+	BASEVERSION=$VERSION
 	;;
      4.1.*)
 	SVNBRANCH="trunk/Shorewall-common"
@@ -323,9 +324,10 @@ case $VERSION in
 	SHELLBRANCH="tags/${BASEVERSION}/Shorewall-shell-${PATCHNUM}"
 	DOCTAG="trunk/docs"
 	XMLPROJ="docs-4.0"
-	SAMPLESTAG="branches/4.0/Samples"
-	MANPAGETAG=branches/4.0/manpages
-	LITEMANPAGETAG=branches/4.0/manpages-lite
+	SAMPLESTAG="tags/${BASEVERSION}/Samples"
+	MANPAGETAG=="tags/${BASEVERSION}/manpages"
+	LITEMANPAGETAG="tags/${BASEVERSION}/manpages-lite"
+	BASEVERSION=$VERSION
 	;;
      4.0.*)
 	SVNBRANCH="branches/4.0/Shorewall-common"
@@ -344,12 +346,6 @@ case $VERSION in
 	;;
 esac
 
-case $VERSION in
-    *.*.*.*)
-	PATCHRELEASE=Yes
-	;;
-esac
-
 [ -d $DIR ] || { echo "Directory $DIR does not exist or is unaccessible" ; exit 2 ; }
 
 progress_message "Distribution directory is $DIR"