diff --git a/tools/build/upload b/tools/build/upload
index ad42659ec..80f4af45e 100755
--- a/tools/build/upload
+++ b/tools/build/upload
@@ -1,6 +1,13 @@
 #/bin/sh
 
-DEST="root@mail.shorewall.net:/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1"
+case $1 in
+    3.1.*)
+	DEST="root@mail.shorewall.net:/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
+	;;
+    *)
+	DEST="root@mail.shorewall.net:/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1"
+	;;
+esac
 
 usage() { echo "$0: <version>"; }