diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml
index 8dc297574c..23faf89b00 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.5.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.jooq</groupId>
diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml
index 6f29d5e120..a90822f577 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.5.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.jooq</groupId>
diff --git a/jOOQ-examples/jOOQ-flyway-example/pom.xml b/jOOQ-examples/jOOQ-flyway-example/pom.xml
index 0bb16ccb61..e358850902 100644
--- a/jOOQ-examples/jOOQ-flyway-example/pom.xml
+++ b/jOOQ-examples/jOOQ-flyway-example/pom.xml
@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        <org.jooq.version>3.5.0</org.jooq.version>
+        <org.jooq.version>3.6.0-SNAPSHOT</org.jooq.version>
 
         <db.url>jdbc:h2:~/flyway-test</db.url>
         <db.username>sa</db.username>
diff --git a/jOOQ-examples/jOOQ-jax-rs-example/.project b/jOOQ-examples/jOOQ-jax-rs-example/.project
index 5766e19708..8162639df1 100644
--- a/jOOQ-examples/jOOQ-jax-rs-example/.project
+++ b/jOOQ-examples/jOOQ-jax-rs-example/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -19,5 +24,6 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/jOOQ-examples/jOOQ-jax-rs-example/pom.xml b/jOOQ-examples/jOOQ-jax-rs-example/pom.xml
index 2c83abc9ca..c9361a72e9 100644
--- a/jOOQ-examples/jOOQ-jax-rs-example/pom.xml
+++ b/jOOQ-examples/jOOQ-jax-rs-example/pom.xml
@@ -35,7 +35,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.0-SNAPSHOT</version>
 
                 <executions>
                     <execution>
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>3.5.0</version>
+            <version>3.6.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
diff --git a/jOOQ-examples/jOOQ-nashorn-example/pom.xml b/jOOQ-examples/jOOQ-nashorn-example/pom.xml
index a2dc54c8c4..54029e2b81 100644
--- a/jOOQ-examples/jOOQ-nashorn-example/pom.xml
+++ b/jOOQ-examples/jOOQ-nashorn-example/pom.xml
@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        <org.jooq.version>3.5.0</org.jooq.version>
+        <org.jooq.version>3.6.0-SNAPSHOT</org.jooq.version>
     </properties>
     
     <dependencies>
diff --git a/jOOQ-examples/jOOQ-oracle-example/pom.xml b/jOOQ-examples/jOOQ-oracle-example/pom.xml
index 08582a625f..f346727eb9 100644
--- a/jOOQ-examples/jOOQ-oracle-example/pom.xml
+++ b/jOOQ-examples/jOOQ-oracle-example/pom.xml
@@ -18,7 +18,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.jooq.version>3.5.0</org.jooq.version>
+        <org.jooq.version>3.6.0-SNAPSHOT</org.jooq.version>
         <db.oracle.version>11</db.oracle.version>
     </properties>
 
diff --git a/jOOQ-examples/jOOQ-spring-example/pom.xml b/jOOQ-examples/jOOQ-spring-example/pom.xml
index 1c46ae5a4d..05a465185a 100644
--- a/jOOQ-examples/jOOQ-spring-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spring-example/pom.xml
@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>4.1.2.RELEASE</org.springframework.version>
-        <org.jooq.version>3.5.0</org.jooq.version>
+        <org.jooq.version>3.6.0-SNAPSHOT</org.jooq.version>
 		<java.version>1.8</java.version>
     </properties>
     
diff --git a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
index c843593a7c..721b97a32b 100644
--- a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>4.1.2.RELEASE</org.springframework.version>
-        <org.jooq.version>3.5.0</org.jooq.version>
+        <org.jooq.version>3.6.0-SNAPSHOT</org.jooq.version>
     </properties>
 
     <dependencies>
diff --git a/jOOQ-examples/jOOQ-vertabelo-example/pom.xml b/jOOQ-examples/jOOQ-vertabelo-example/pom.xml
index a1be82cc8d..89bc93ab7d 100644
--- a/jOOQ-examples/jOOQ-vertabelo-example/pom.xml
+++ b/jOOQ-examples/jOOQ-vertabelo-example/pom.xml
@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        <org.jooq.version>3.5.0</org.jooq.version>
+        <org.jooq.version>3.6.0-SNAPSHOT</org.jooq.version>
     </properties>
     
     <dependencies>
diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml
index 439ab7eaea..5ffec124e0 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.5.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jooq</groupId>
diff --git a/jOOQ-release/build.xml b/jOOQ-release/build.xml
index 80a14e1b59..56a3a7b1ca 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" value="3.5.0"/>
+	<property name="version" value="3.6.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/RELEASENOTES.txt b/jOOQ-release/release/template/RELEASENOTES.txt
index 61af4b1bbe..14a790f7d1 100644
--- a/jOOQ-release/release/template/RELEASENOTES.txt
+++ b/jOOQ-release/release/template/RELEASENOTES.txt
@@ -10,7 +10,7 @@ http://www.jooq.org/notes.php
 For a text version, see
 http://www.jooq.org/inc/RELEASENOTES.txt
 
-Version 3.5.0 - September 19, 2014
+Version 3.5.0 - November 21, 2014
 ================================================================================
 
 The new Binding SPI
diff --git a/jOOQ-release/release/template/maven-install.bat b/jOOQ-release/release/template/maven-install.bat
index df05555ec7..79c7d55764 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.5.0
+set VERSION=3.6.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 ebafec9af6..e53b865d94 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.5.0
+VERSION=3.6.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 49e673bb80..d2333ddeb7 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.5.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jooq</groupId>
@@ -68,7 +68,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <id>exec1</id>
diff --git a/jOOQ/.settings/org.eclipse.core.resources.prefs b/jOOQ/.settings/org.eclipse.core.resources.prefs
index 5240b69c1b..29abf99956 100644
--- a/jOOQ/.settings/org.eclipse.core.resources.prefs
+++ b/jOOQ/.settings/org.eclipse.core.resources.prefs
@@ -3,5 +3,4 @@ encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
-encoding//target/generated-sources/xjc=UTF-8
 encoding/<project>=UTF-8
diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml
index 665b8903fb..e81edd2aa4 100644
--- a/jOOQ/pom.xml
+++ b/jOOQ/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.5.0</version>
+        <version>3.6.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 9ba70a3e11..db0241a2ce 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.5";
+    public static final String MINOR_VERSION  = "3.6";
 
     /**
      * 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.5.0";
+    public static final String VERSION        = "3.6.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.5.0";
+    public static final String FULL_VERSION   = "3.6.0";
 
     /**
      * The current jooq-runtime XSD file name.
diff --git a/pom.xml b/pom.xml
index ad1e6a913c..df774cbb65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-parent</artifactId>
-    <version>3.5.0</version>
+    <version>3.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>jOOQ Parent</name>