--- a/.hgignore
+++ b/.hgignore
@@ -5,7 +5,6 @@ syntax: glob
 *.jar
 build/META-INF/services/java.sql.Driver
 src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
-upload_jdbc_new.sh
 
 # files generated by various editors
 *.swp

--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 all: src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
-	. ./build.properties; sed -e "s/@JDBC_MAJOR@/$$JDBC_MAJOR/g;s/@JDBC_MINOR@/$$JDBC_MINOR/g" upload_jdbc_new.sh.in > upload_jdbc_new.sh
 	ant -f build.xml distjdbc distmerocontrol
 	cd tests; ant -f build.xml jar_jdbctests
 

--- a/build.properties
+++ b/build.properties
@@ -10,7 +10,8 @@
 MCL_MAJOR=1
 # minor release number
 MCL_MINOR=14
-
+# snapshot release string
+MCL_SNAPSHOT=
 
 ##
 ## JDBC (and client)
@@ -20,6 +21,8 @@ MCL_MINOR=14
 JDBC_MAJOR=2
 # minor release number
 JDBC_MINOR=37
+# snapshot release string
+JDBC_SNAPSHOT=-SNAPSHOT
 # an additional identifying string
 JDBC_VER_SUFFIX=Liberica
 # the default port to connect on, if no port given when using SQL

--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>monetdb</groupId>
 	<artifactId>monetdb-jdbc-new</artifactId>
-	<version>2.36</version>
+	<version>2.37-SNAPSHOT</version>
 	<name>MonetDB JDBC new</name>
 	<description>MonetDB Adapted JDBC driver for embedded connection</description>
 	<url>https://www.monetdb.org</url>

--- a/release.txt
+++ b/release.txt
@@ -1,6 +1,6 @@
 RELEASE NOTES
-MonetDB JDBC driver version 2.27 (Liberica/MCL-1.16)
-Release date: 2017-10-23
+MonetDB JDBC driver version 2.37-SNAPSHOT (Liberica/MCL-1.16)
+Release date: 2018-06-12
 
 This JDBC driver is designed for use with MonetDB, a main-memory column-store RDBMS.
 For more information see https://www.monetdb.org/

new file mode 100644
--- /dev/null
+++ b/upload_jdbc_new.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+function echo_and_exit {
+	echo $1 >&2
+	exit 1
+}
+
+if [[ -z $JAVA_HOME ]] ; then
+    echo_and_exit "The JAVA_HOME directory must be set"
+fi
+
+# Prepare the directory to upload to our website
+mkdir synchronizing
+# Move the monetdb-jdbc-new jar
+mv jars/monetdb-jdbc-new-2.37-SNAPSHOT.jar synchronizing/monetdb-jdbc-new-2.37-SNAPSHOT.jar
+# Rsync the library files to the monet.org machine
+rsync -aqz --ignore-times synchronizing/* ferreira@monetdb.org:/var/www/html/downloads/Java-Experimental/
+# Remove it in the end
+rm -rf synchronizing

deleted file mode 100644
--- a/upload_jdbc_new.sh.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -e
-
-function echo_and_exit {
-	echo $1 >&2
-	exit 1
-}
-
-if [[ -z $JAVA_HOME ]] ; then
-    echo_and_exit "The JAVA_HOME directory must be set"
-fi
-
-# Prepare the directory to upload to our website
-mkdir synchronizing
-# Move the monetdb-jdbc-new jar
-mv jars/monetdb-jdbc-new-@JDBC_MAJOR@.@JDBC_MINOR@.jar synchronizing/monetdb-jdbc-new-@JDBC_MAJOR@.@JDBC_MINOR@.jar
-# Rsync the library files to the monet.org machine
-rsync -aqz --ignore-times synchronizing/* ferreira@monetdb.org:/var/www/html/downloads/Java-Experimental/
-# Remove it in the end
-rm -rf synchronizing

--- a/version.sh
+++ b/version.sh
@@ -7,7 +7,7 @@
 # Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
 
 if [[ -z $1 ]] ; then
-	echo "Usage: $0 [-w] <(jdbc|mcl)> <(major|minor|suffix)=newversion> [...]"
+	echo "Usage: $0 [-w] <(jdbc|mcl)> <(major|minor|suffix|snapshot)=newversion> [...]"
 	echo "where -w activates actual write of changes"
 	exit -1
 fi
@@ -51,14 +51,17 @@ shift
 CUR_MAJOR=$(eval "get_value '${TYPE}_MAJOR'")
 CUR_MINOR=$(eval "get_value '${TYPE}_MINOR'")
 CUR_SUFFIX=$(eval "get_value '${TYPE}_VER_SUFFIX'")
+CUR_SNAPSHOT=$(eval "get_value '${TYPE}_SNAPSHOT'")
 
 NEW_MAJOR=${CUR_MAJOR}
 NEW_MINOR=${CUR_MINOR}
 NEW_SUFFIX=${CUR_SUFFIX}
+NEW_SNAPSHOT=${CUR_SNAPSHOT}
 
 ESC_MAJOR=$(escape_value ${CUR_MAJOR})
 ESC_MINOR=$(escape_value ${CUR_MINOR})
 ESC_SUFFIX=$(escape_value ${CUR_SUFFIX})
+ESC_SNAPSHOT=$(escape_value ${CUR_SNAPSHOT})
 
 for param in $* ; do
 	arg=${param%%=*}
@@ -82,18 +85,21 @@ for param in $* ; do
 	suffix)
 		NEW_SUFFIX=${val}
 		;;
+	snapshot)
+		NEW_SNAPSHOT=${val}
+		;;
 	esac
 done
 
-echo "Current version: ${CUR_MAJOR}.${CUR_MINOR} (${CUR_SUFFIX})"
-echo "New version:     ${NEW_MAJOR}.${NEW_MINOR} (${NEW_SUFFIX})"
+echo "Current version: ${CUR_MAJOR}.${CUR_MINOR}${CUR_SNAPSHOT} (${CUR_SUFFIX})"
+echo "New version:     ${NEW_MAJOR}.${NEW_MINOR}${NEW_SNAPSHOT} (${NEW_SUFFIX})"
 
 diff="diff -Naur"
 
 file="release.txt"
 sed \
-	-e "s|version ${ESC_MAJOR}\.${ESC_MINOR} (${ESC_SUFFIX}|version ${NEW_MAJOR}.${NEW_MINOR} \(${NEW_SUFFIX}|g" \
-	-e "s|${TYPE}-${ESC_MAJOR}\.${ESC_MINOR}|${TYPE}-${NEW_MAJOR}.${NEW_MINOR}|g" \
+	-e "s|version ${ESC_MAJOR}\.${ESC_MINOR}${ESC_SNAPSHOT} (${ESC_SUFFIX}|version ${NEW_MAJOR}.${NEW_MINOR}${NEW_SNAPSHOT} \(${NEW_SUFFIX}|g" \
+	-e "s|${TYPE}-${ESC_MAJOR}\.${ESC_MINOR}${ESC_SNAPSHOT}|${TYPE}-${NEW_MAJOR}.${NEW_MINOR}${NEW_SNAPSHOT}|g" \
 	-e "s|Release date: 20[0-9][0-9]-[01][0-9]-[0-3][0-9]|Release date: `date +%F`|" \
 	${file} | ${diff} ${file} - | ${patch}
 
@@ -101,10 +107,16 @@ file="build.properties"
 sed \
 	-e "s|${TYPE}_MAJOR=${ESC_MAJOR}|${TYPE}_MAJOR=${NEW_MAJOR}|g" \
 	-e "s|${TYPE}_MINOR=${ESC_MINOR}|${TYPE}_MINOR=${NEW_MINOR}|g" \
+	-e "s|${TYPE}_SNAPSHOT=${ESC_SNAPSHOT}|${TYPE}_SNAPSHOT=${NEW_SNAPSHOT}|g" \
 	-e "s|${TYPE}_VER_SUFFIX=${ESC_SUFFIX}|${TYPE}_VER_SUFFIX=${NEW_SUFFIX}|g" \
 	${file} | ${diff} ${file} - | ${patch}
 
 file="pom.xml"
 sed \
-	-e "s|<version>${ESC_MAJOR}\.${ESC_MINOR}</version>|<version>${NEW_MAJOR}.${NEW_MINOR}</version>|g" \
+	-e "s|<version>${ESC_MAJOR}\.${ESC_MINOR}${ESC_SNAPSHOT}</version>|<version>${NEW_MAJOR}.${NEW_MINOR}${NEW_SNAPSHOT}</version>|g" \
 	${file} | ${diff} ${file} - | ${patch}
+
+file="upload_jdbc_new.sh"
+sed \
+	-e "s|monetdb-jdbc-new-${ESC_MAJOR}\.${ESC_MINOR}${ESC_SNAPSHOT}|monetdb-jdbc-new-${NEW_MAJOR}.${NEW_MINOR}${NEW_SNAPSHOT}|g" \
+	${file} | ${diff} ${file} - | ${patch}