diff --git a/tools/build/makeshorewall b/tools/build/makeshorewall
index 755932c70..a222a16d3 100644
--- a/tools/build/makeshorewall
+++ b/tools/build/makeshorewall
@@ -240,7 +240,7 @@ case $VERSION in
 	XMLPROJ=Shorewall-docs2
 	BUILDLRP=
 	;;
-    2.5.*|3.0.0*)
+    3.0.*)
         CVSTAG=HEAD
 	DOCTAG=HEAD
 	XMLPROJ=Shorewall-docs2
diff --git a/tools/build/upload b/tools/build/upload
new file mode 100755
index 000000000..be286761f
--- /dev/null
+++ b/tools/build/upload
@@ -0,0 +1,12 @@
+#/bin/sh
+
+DEST="root@mail.shorewall.net:/var/ftp/pub/shorewall/${1%.*}/shorewall-$1"
+
+usage() { echo "$0: <version>"; }
+
+[ $# -eq 1 ] || usage
+
+[ -d errata ] || mkdir errata
+echo "There are no known problems in Shorewall version $1" > known_problems.txt
+
+scp -r errata known_problems.txt patch-$1 ${1}.* shorewall-${1}/releasenotes.txt shorewall-${1}-[0-1]* shorewall*${1}*.tgz* shorewall*${1}*.bz2* $DEST