diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml
index d2a155e0dd..788be2f597 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.7.0</version>
+        <version>3.8.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.jooq</groupId>
diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml
index 05bb474a89..f4e95dba36 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.7.0</version>
+        <version>3.8.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.jooq</groupId>
diff --git a/jOOQ-examples/jOOQ-academy/pom.xml b/jOOQ-examples/jOOQ-academy/pom.xml
index dee853db3d..e3525e964a 100644
--- a/jOOQ-examples/jOOQ-academy/pom.xml
+++ b/jOOQ-examples/jOOQ-academy/pom.xml
@@ -18,7 +18,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.jooq.version>3.7.0</org.jooq.version>
+        <org.jooq.version>3.8.0-SNAPSHOT</org.jooq.version>
 		<h2.version>1.4.181</h2.version>
     </properties>
     
diff --git a/jOOQ-examples/jOOQ-codegen-gradle/build.gradle b/jOOQ-examples/jOOQ-codegen-gradle/build.gradle
index ae9cf66cb6..73ac6abfe3 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.7.0'
+    compile 'org.jooq:jooq:3.8.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.7.0'
+        classpath 'org.jooq:jooq-codegen:3.8.0-SNAPSHOT'
         classpath 'com.h2database:h2:1.4.177'
     }
 }
diff --git a/jOOQ-meta-extensions/pom.xml b/jOOQ-meta-extensions/pom.xml
index 09208a2141..535ff5779a 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.7.0</version>
+        <version>3.8.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jooq</groupId>
diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml
index 1dd5d359cf..f4e7861945 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.7.0</version>
+        <version>3.8.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jooq</groupId>
@@ -47,7 +47,7 @@
                             <schemaDirectory>src/main/resources/xsd</schemaDirectory>
                             <bindingDirectory>src/main/resources/xjb/codegen</bindingDirectory>
                             <schemaIncludes>
-                                <include>jooq-codegen-3.7.0.xsd</include>
+                                <include>jooq-codegen-3.8.0-SNAPSHOT.xsd</include>
                             </schemaIncludes>
                             <generatePackage>org.jooq.util.jaxb</generatePackage>
                             <args>
diff --git a/jOOQ-release/build.xml b/jOOQ-release/build.xml
index d8af131ff4..12794c798a 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.7.0"/>
+    <property name="version-prefix" value="3.8.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 35cd8ecab8..9ff5404d70 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.7.0
+set VERSION=3.8.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 c56ad76022..65870db32b 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.7.0
+VERSION=3.8.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 d87e76a11c..a4f6605ef6 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.7.0</version>
+        <version>3.8.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jooq</groupId>
@@ -70,7 +70,7 @@
             xxxxxxxx
                 xxxxxxxxxxxxxxxxxxxxxxxxxxx
                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-                xxxxxxxxxxxxxxxxxxxxxxxx
+                xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                 xxxxxxxxxxxx
                     xxxxxxxxxxx
                         xxxxxxxxxxxxxx
diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml
index 0778299591..9eb6ee3d1c 100644
--- a/jOOQ/pom.xml
+++ b/jOOQ/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jooq</groupId>
@@ -54,7 +54,7 @@
                     <schemaDirectory>src/main/resources/xsd</schemaDirectory>
                     <bindingDirectory>src/main/resources/xjb</bindingDirectory>
                     <schemaIncludes>
-                        <include>jooq-runtime-3.7.0.xsd</include>
+                        <include>jooq-runtime-3.8.0-SNAPSHOT.xsd</include>
                     </schemaIncludes>
                     <generatePackage>org.jooq.conf</generatePackage>
                     <args>
diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java
index 0e2bf202d0..4696943eb7 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.7";
+    public static final String MINOR_VERSION  = "3.8";
 
     /**
      * 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.7.0";
+    public static final String VERSION        = "3.8.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.7.0";
+    public static final String FULL_VERSION   = "3.8.0";
 
     /**
      * The current jooq-runtime XSD file name.
diff --git a/pom.xml b/pom.xml
index b997822fd2..3e588abe55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-parent</artifactId>
-    <version>3.7.0</version>
+    <version>3.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>jOOQ Parent</name>