diff --git a/jOOQ-examples/jOOQ-academy/pom.xml b/jOOQ-examples/jOOQ-academy/pom.xml
index ed42b0a230..62fefd27c6 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.6.2</org.jooq.version>
+        <org.jooq.version>3.6.4</org.jooq.version>
 		<h2.version>1.4.181</h2.version>
     </properties>
     
diff --git a/jOOQ-examples/jOOQ-flyway-example/pom.xml b/jOOQ-examples/jOOQ-flyway-example/pom.xml
index 2c58834f2b..caf8ca89c1 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.6.2</org.jooq.version>
+        <org.jooq.version>3.6.4</org.jooq.version>
         <org.h2.version>1.4.181</org.h2.version>
 
         <db.url>jdbc:h2:~/flyway-test</db.url>
diff --git a/jOOQ-examples/jOOQ-javaee-example/pom.xml b/jOOQ-examples/jOOQ-javaee-example/pom.xml
index 6a429345aa..a7e345b85b 100644
--- a/jOOQ-examples/jOOQ-javaee-example/pom.xml
+++ b/jOOQ-examples/jOOQ-javaee-example/pom.xml
@@ -19,7 +19,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.jooq.version>3.6.2</org.jooq.version>
+        <org.jooq.version>3.6.4</org.jooq.version>
         <org.h2.version>1.3.173</org.h2.version>
         <java.version>1.8</java.version>
         
diff --git a/jOOQ-examples/jOOQ-javafx-example/pom.xml b/jOOQ-examples/jOOQ-javafx-example/pom.xml
index 47e5f165b3..fe407d66c0 100644
--- a/jOOQ-examples/jOOQ-javafx-example/pom.xml
+++ b/jOOQ-examples/jOOQ-javafx-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.6.2</org.jooq.version>
+        <org.jooq.version>3.6.4</org.jooq.version>
         <org.h2.version>1.4.181</org.h2.version>
     </properties>
     
diff --git a/jOOQ-examples/jOOQ-jax-rs-example/pom.xml b/jOOQ-examples/jOOQ-jax-rs-example/pom.xml
index a4c7e5b269..90b03fcfde 100644
--- a/jOOQ-examples/jOOQ-jax-rs-example/pom.xml
+++ b/jOOQ-examples/jOOQ-jax-rs-example/pom.xml
@@ -10,7 +10,7 @@
     <version>1.0</version>
     
     <properties>
-        <org.jooq.version>3.6.2</org.jooq.version>
+        <org.jooq.version>3.6.4</org.jooq.version>
     </properties>
 
     <build>
diff --git a/jOOQ-examples/jOOQ-nashorn-example/pom.xml b/jOOQ-examples/jOOQ-nashorn-example/pom.xml
index 9540c0e76e..9f553cb2ca 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.6.2</org.jooq.version>
+        <org.jooq.version>3.6.4</org.jooq.version>
         <org.h2.version>1.4.181</org.h2.version>
     </properties>
     
diff --git a/jOOQ-examples/jOOQ-oracle-example/pom.xml b/jOOQ-examples/jOOQ-oracle-example/pom.xml
index ab404379af..2bb63b5184 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.6.2</org.jooq.version>
+        <org.jooq.version>3.6.4</org.jooq.version>
         <db.oracle.version>11</db.oracle.version>
     </properties>
 
diff --git a/jOOQ-examples/jOOQ-spark-example/pom.xml b/jOOQ-examples/jOOQ-spark-example/pom.xml
index 899f36c81d..b361e25a12 100644
--- a/jOOQ-examples/jOOQ-spark-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spark-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.6.2</org.jooq.version>
+        <org.jooq.version>3.6.4</org.jooq.version>
         <org.h2.version>1.4.181</org.h2.version>
     </properties>
     
diff --git a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
index 23e69b713c..62d98d315e 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.6.2</org.jooq.version>
+        <org.jooq.version>3.6.4</org.jooq.version>
         <org.h2.version>1.4.181</org.h2.version>
     </properties>
 
diff --git a/jOOQ-examples/jOOQ-vertabelo-example/pom.xml b/jOOQ-examples/jOOQ-vertabelo-example/pom.xml
index 39f26b3439..9f3d2f6893 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.6.2</org.jooq.version>
+        <org.jooq.version>3.6.4</org.jooq.version>
         <org.h2.version>1.4.181</org.h2.version>
     </properties>
     
diff --git a/jOOQ-release/release/template/RELEASENOTES.txt b/jOOQ-release/release/template/RELEASENOTES.txt
index 018505c1b5..af4f21a5b9 100644
--- a/jOOQ-release/release/template/RELEASENOTES.txt
+++ b/jOOQ-release/release/template/RELEASENOTES.txt
@@ -11,6 +11,16 @@ For a text version, see
 http://www.jooq.org/inc/RELEASENOTES.txt
 
 
+Version 3.6.3 - September 18, 2015
+================================================================================
+
+This is a patch release with some useful fixes for the 3.6 branch
+
+Bug Fixes
+---------
+#4583 - JavaWriter uses regex syntax unsupported in Java <1.8
+#4584 - SQL comments with javadoc terminators break generated code
+
 Version 3.6.3 - September 18, 2015
 ================================================================================