diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml
index a1221dc3fc..5c077ecb24 100644
--- a/jOOQ-codegen-maven/pom.xml
+++ b/jOOQ-codegen-maven/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.6.0</version>
+        <version>3.7.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.jooq</groupId>
diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml
index be1b18feb9..cbdc9a8bce 100644
--- a/jOOQ-codegen/pom.xml
+++ b/jOOQ-codegen/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.6.0</version>
+        <version>3.7.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.jooq</groupId>
diff --git a/jOOQ-examples/jOOQ-codegen-gradle/build.gradle b/jOOQ-examples/jOOQ-codegen-gradle/build.gradle
index 4984aa14e3..2d6e3f0d9b 100644
--- a/jOOQ-examples/jOOQ-codegen-gradle/build.gradle
+++ b/jOOQ-examples/jOOQ-codegen-gradle/build.gradle
@@ -49,7 +49,7 @@ repositories {
 }
 
 dependencies {
-    compile 'org.jooq:jooq:3.6.0'
+    compile 'org.jooq:jooq:3.7.0-SNAPSHOT'
 
     runtime 'com.h2database:h2:1.4.177'
     testCompile 'junit:junit:4.11'
@@ -62,7 +62,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'org.jooq:jooq-codegen:3.6.0'
+        classpath 'org.jooq:jooq-codegen:3.7.0-SNAPSHOT'
         classpath 'com.h2database:h2:1.4.177'
     }
 }
diff --git a/jOOQ-meta-extensions/pom.xml b/jOOQ-meta-extensions/pom.xml
index e63320c3b0..269986543a 100644
--- a/jOOQ-meta-extensions/pom.xml
+++ b/jOOQ-meta-extensions/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.6.0</version>
+        <version>3.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jooq</groupId>
diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml
index 10e0c7131b..17099c3384 100644
--- a/jOOQ-meta/pom.xml
+++ b/jOOQ-meta/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.6.0</version>
+        <version>3.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jooq</groupId>
diff --git a/jOOQ-release/build.xml b/jOOQ-release/build.xml
index c3b164d3ff..2af8f3925c 100644
--- a/jOOQ-release/build.xml
+++ b/jOOQ-release/build.xml
@@ -3,7 +3,7 @@
 	<property name="dir.workspace" value="${basedir}/.." />
 	<property name="dir.target" value="${basedir}/target" />
 	<property name="dir.release" value="${basedir}/release" />
-	<property name="version-prefix" value="3.6.0"/>
+	<property name="version-prefix" value="3.7.0-SNAPSHOT"/>
 
 	<!-- Run a full mvn clean package install deploy first before this -->
 	<target name="copy-lib-javadoc">
diff --git a/jOOQ-release/release/template/maven-install.bat b/jOOQ-release/release/template/maven-install.bat
index dc044bd14b..8e0a137836 100644
--- a/jOOQ-release/release/template/maven-install.bat
+++ b/jOOQ-release/release/template/maven-install.bat
@@ -1,5 +1,5 @@
 @echo off
-set VERSION=3.6.0
+set VERSION=3.7.0-SNAPSHOT
 
 if exist jOOQ-javadoc\jooq-%VERSION%-javadoc.jar (
   set JAVADOC_JOOQ=-Djavadoc=jOOQ-javadoc\jooq-%VERSION%-javadoc.jar
diff --git a/jOOQ-release/release/template/maven-install.sh b/jOOQ-release/release/template/maven-install.sh
index 0529183a18..08880b6a9e 100644
--- a/jOOQ-release/release/template/maven-install.sh
+++ b/jOOQ-release/release/template/maven-install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-VERSION=3.6.0
+VERSION=3.7.0-SNAPSHOT
 
 if [ -f jOOQ-javadoc/jooq-$VERSION-javadoc.jar ]; then
   JAVADOC_JOOQ=-Djavadoc=jOOQ-javadoc/jooq-$VERSION-javadoc.jar
diff --git a/jOOQ-scala/pom.xml b/jOOQ-scala/pom.xml
index 0a735dcaea..308a37a01d 100644
--- a/jOOQ-scala/pom.xml
+++ b/jOOQ-scala/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.6.0</version>
+        <version>3.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jooq</groupId>
@@ -69,7 +69,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>3.6.0</version>
+                <version>3.7.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <id>exec1</id>
diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml
index 9eaa69ed19..e2f73d3793 100644
--- a/jOOQ/pom.xml
+++ b/jOOQ/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.6.0</version>
+        <version>3.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jooq</groupId>
diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java
index 0b2a50bc64..a78ef91996 100644
--- a/jOOQ/src/main/java/org/jooq/Constants.java
+++ b/jOOQ/src/main/java/org/jooq/Constants.java
@@ -50,7 +50,7 @@ public final class Constants {
     /**
      * The latest jOOQ minor version.
      */
-    public static final String MINOR_VERSION  = "3.6";
+    public static final String MINOR_VERSION  = "3.7";
 
     /**
      * The latest jOOQ version.
@@ -58,7 +58,7 @@ public final class Constants {
      * This is the same as {@link #MINOR_VERSION}, but it may include patch
      * version suffixes.
      */
-    public static final String VERSION        = "3.6.0";
+    public static final String VERSION        = "3.7.0";
 
     /**
      * The latest jOOQ full version.
@@ -66,7 +66,7 @@ public final class Constants {
      * This is the same as {@link #VERSION}, but it may include release
      * candidate and other suffixes.
      */
-    public static final String FULL_VERSION   = "3.6.0";
+    public static final String FULL_VERSION   = "3.7.0";
 
     /**
      * The current jooq-runtime XSD file name.
diff --git a/pom.xml b/pom.xml
index f7ac07b046..6915198fd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-parent</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>jOOQ Parent</name>