diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index a6e323dcd..8d5b25023 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -335,7 +335,7 @@ case $VERSION in
 	DOCTAG="branches/4.2/docs"
 	XMLPROJ="docs-4.2"
 	SAMPLESTAG="tags/${BASEVERSION}/Samples"
-	SAMPLES6TAG="trunk/Samples6"
+	SAMPLES6TAG="tags/${BASEVERSION}/Samples6"
 	MANPAGETAG="tags/${BASEVERSION}/manpages"
 	MANPAGE6TAG="tags/${BASEVERSION}/manpages6"
 	LITEMANPAGETAG="tags/${BASEVERSION}/manpages-lite"
@@ -350,8 +350,8 @@ case $VERSION in
 	SHELLBRANCH="branches/4.2/Shorewall-shell"
 	DOCTAG="branches/4.2/docs"
 	XMLPROJ="docs-4.2"
-	SAMPLESTAG="trunk/Samples"
-	SAMPLES6TAG="trunk/Samples6"
+	SAMPLESTAG="branches/4.2/Samples"
+	SAMPLES6TAG="branches/4.2/Samples6"
 	MANPAGETAG=branches/4.2/manpages
 	MANPAGE6TAG=branches/4.2/manpages6
 	LITEMANPAGETAG=branches/4.2/manpages-lite