diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index 68a40c817..2428b11b4 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -241,7 +241,19 @@ case $VERSION in
 	PERLBRANCH="trunk/Shorewall-perl"
 	SHELLBRANCH="trunk/Shorewall-shell"
 	DOCTAG="trunk/docs"
-	XMLPROJ="docs-3.4"
+	XMLPROJ="docs-3.9"
+	SAMPLESTAG="trunk/Samples"
+	MANPAGETAG=trunk/manpages
+	LITEMANPAGETAG=trunk/manpages-lite
+	;;
+case $VERSION in
+     4.0.*)
+	SVNBRANCH="trunk/Shorewall-common"
+	LITESVNBRANCH="trunk/Shorewall-lite"
+	PERLBRANCH="trunk/Shorewall-perl"
+	SHELLBRANCH="trunk/Shorewall-shell"
+	DOCTAG="trunk/docs"
+	XMLPROJ="docs-4.0"
 	SAMPLESTAG="trunk/Samples"
 	MANPAGETAG=trunk/manpages
 	LITEMANPAGETAG=trunk/manpages-lite