diff --git a/jOOQ-release/build.xml b/jOOQ-release/build.xml
index c4651a39a1..526d5483b3 100644
--- a/jOOQ-release/build.xml
+++ b/jOOQ-release/build.xml
@@ -15,7 +15,9 @@
         <mkdir dir="${dir.release}/${dir.version}/jOOQ-pom/jooq-meta"/>
         <mkdir dir="${dir.release}/${dir.version}/jOOQ-pom/jooq-codegen"/>
         <mkdir dir="${dir.release}/${dir.version}/jOOQ-pom/jooq-codegen-maven"/>
+        <!-- [java-8] -->
         <mkdir dir="${dir.release}/${dir.version}/jOOQ-pom/jooq-checker"/>
+        <!-- [/java-8] -->
         <mkdir dir="${dir.release}/${dir.version}/jOOQ-pom/jooq-scala"/>
 
         <copy todir="${dir.release}/${dir.version}/jOOQ-lib" file="${dir.workspace}/jOOQ/target/jooq-${version-prefix}.jar"/>
@@ -23,7 +25,9 @@
         <copy todir="${dir.release}/${dir.version}/jOOQ-lib" file="${dir.workspace}/jOOQ-meta-extensions/target/jooq-meta-extensions-${version-prefix}.jar"/>
         <copy todir="${dir.release}/${dir.version}/jOOQ-lib" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version-prefix}.jar"/>
         <copy todir="${dir.release}/${dir.version}/jOOQ-lib" file="${dir.workspace}/jOOQ-codegen-maven/target/jooq-codegen-maven-${version-prefix}.jar"/>
+        <!-- [java-8] -->
         <copy todir="${dir.release}/${dir.version}/jOOQ-lib" file="${dir.workspace}/jOOQ-checker/target/jooq-checker-${version-prefix}.jar"/>
+        <!-- [/java-8] -->
         <copy todir="${dir.release}/${dir.version}/jOOQ-lib" file="${dir.workspace}/jOOQ-scala/target/jooq-scala-${version-prefix}.jar"/>
 
         <copy todir="${dir.release}/${dir.version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ/target/jooq-${version-prefix}-javadoc.jar"/>
@@ -31,7 +35,9 @@
         <copy todir="${dir.release}/${dir.version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-meta-extensions/target/jooq-meta-extensions-${version-prefix}-javadoc.jar"/>
         <copy todir="${dir.release}/${dir.version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version-prefix}-javadoc.jar"/>
         <copy todir="${dir.release}/${dir.version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-codegen-maven/target/jooq-codegen-maven-${version-prefix}-javadoc.jar"/>
+        <!-- [java-8] -->
         <copy todir="${dir.release}/${dir.version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-checker/target/jooq-checker-${version-prefix}-javadoc.jar"/>
+        <!-- [/java-8] -->
         <copy todir="${dir.release}/${dir.version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-scala/target/jooq-scala-${version-prefix}-javadoc.jar"/>
 
         <copy todir="${dir.release}/${dir.version}/jOOQ-pom"                      file="${dir.workspace}/pom.xml"/>
@@ -40,7 +46,9 @@
         <copy todir="${dir.release}/${dir.version}/jOOQ-pom/jooq-meta-extensions" file="${dir.workspace}/jOOQ-meta-extensions/pom.xml"/>
         <copy todir="${dir.release}/${dir.version}/jOOQ-pom/jooq-codegen"         file="${dir.workspace}/jOOQ-codegen/pom.xml"/>
         <copy todir="${dir.release}/${dir.version}/jOOQ-pom/jooq-codegen-maven"   file="${dir.workspace}/jOOQ-codegen-maven/pom.xml"/>
+        <!-- [java-8] -->
         <copy todir="${dir.release}/${dir.version}/jOOQ-pom/jooq-checker"         file="${dir.workspace}/jOOQ-checker/pom.xml"/>
+        <!-- [/java-8] -->
         <copy todir="${dir.release}/${dir.version}/jOOQ-pom/jooq-scala"           file="${dir.workspace}/jOOQ-scala/pom.xml"/>
     </target>
 
@@ -53,7 +61,9 @@
         <copy todir="${dir.release}/${dir.version}/jOOQ-src" file="${dir.workspace}/jOOQ-meta-extensions/target/jooq-meta-extensions-${version-prefix}-sources.jar"/>
         <copy todir="${dir.release}/${dir.version}/jOOQ-src" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version-prefix}-sources.jar"/>
         <copy todir="${dir.release}/${dir.version}/jOOQ-src" file="${dir.workspace}/jOOQ-codegen-maven/target/jooq-codegen-maven-${version-prefix}-sources.jar"/>
+        <!-- [java-8] -->
         <copy todir="${dir.release}/${dir.version}/jOOQ-src" file="${dir.workspace}/jOOQ-checker/target/jooq-checker-${version-prefix}-sources.jar"/>
+        <!-- [/java-8] -->
         <copy todir="${dir.release}/${dir.version}/jOOQ-src" file="${dir.workspace}/jOOQ-scala/target/jooq-scala-${version-prefix}-sources.jar"/>
 
         <zip destfile="${dir.release}/${dir.version}/jOOQ-src/jooq-${version-prefix}-all-sources.zip">
@@ -69,7 +79,9 @@
                 <include name="jOOQ-examples/**"/>
                 <include name="jOOQ-meta/**"/>
                 <include name="jOOQ-meta-extensions/**"/>
+                <!-- [java-8] -->
                 <include name="jOOQ-checker/**"/>
+                <!-- [/java-8] -->
                 <include name="jOOQ-scala/**"/>
                 <include name="authors.txt"/>
                 <include name="LICENSE"/>
diff --git a/jOOQ-release/release/template/RELEASENOTES.txt b/jOOQ-release/release/template/RELEASENOTES.txt
index d8cf3d53fe..1004896c42 100644
--- a/jOOQ-release/release/template/RELEASENOTES.txt
+++ b/jOOQ-release/release/template/RELEASENOTES.txt
@@ -11,6 +11,27 @@ For a text version, see
 http://www.jooq.org/inc/RELEASENOTES.txt
 
 
+Version 3.9.1 - January 20, 2017
+================================================================================
+
+This is a patch release with some useful fixes for the 3.8 branch
+
+Features and Improvements
+-------------------------
+#5802 - Stop distributing third party dependencies through zip distribution
+
+Bug Fixes
+---------
+#5743 - jOOQ-checker is not deployed to Maven Central
+#5752 - Log WARN if users combine nested catalog configurations with top-level inputSchema configuration
+#5756 - Parser cannot parse bind variables
+#5766 - Compilation error in generated schema when table-valued function literal clashes with class name
+#5773 - MockResultSet should call Converter to transform MockResult's <U> back to <T>
+#5777 - DefaultBinding cannot parse +HH timezone offset
+#5786 - KeepNamesGeneratorStrategy generates wrong Keys.java
+#5801 - Oracle 12c support for OFFSET .. FETCH causes ORA-00918 regression on queries with ambiguous column names
+
+
 Version 3.9.0 - December 23, 2016
 ================================================================================
 
@@ -102,13 +123,11 @@ API that creates a new Configuration is too confusing. This is why jOOQ 3.9 now
 introduces the ThreadLocalTransactionProvider implementation that allows for the
 simpler transaction API to be used:
 
-<pre>
 ctx.transaction(() -> {
   // Safe to re-use the "global" ctx here:
   ctx.insertInto(TABLE_A);
   ctx.update(TABLE_B);
 });
-</pre>
 
 Besides, we now support a new TransactionListener SPI, which allows for hooking
 into the transaction lifecycle and execute stuff prior to beginning / committing
diff --git a/jOOQ-release/release/template/maven-install.bat b/jOOQ-release/release/template/maven-install.bat
index 0fbdbf4e0c..7f41d15b4e 100644
--- a/jOOQ-release/release/template/maven-install.bat
+++ b/jOOQ-release/release/template/maven-install.bat
@@ -7,7 +7,9 @@ if exist jOOQ-javadoc\jooq-%VERSION%-javadoc.jar (
   set JAVADOC_JOOQ_META_EXTENSIONS=-Djavadoc=jOOQ-javadoc\jooq-meta-extensions-%VERSION%-javadoc.jar
   set JAVADOC_JOOQ_CODEGEN=-Djavadoc=jOOQ-javadoc\jooq-codegen-%VERSION%-javadoc.jar
   set JAVADOC_JOOQ_CODEGEN_MAVEN=-Djavadoc=jOOQ-javadoc\jooq-codegen-maven-%VERSION%-javadoc.jar
+  rem [java-8]
   set JAVADOC_JOOQ_CHECKER=-Djavadoc=jOOQ-javadoc\jooq-checker-%VERSION%-javadoc.jar
+  rem [/java-8]
   set JAVADOC_JOOQ_SCALA=-Djavadoc=jOOQ-javadoc\jooq-scala-%VERSION%-javadoc.jar
 )
 
@@ -17,7 +19,9 @@ if exist jOOQ-src\jooq-%VERSION%-sources.jar (
   set SOURCES_JOOQ_META_EXTENSIONS=-Dsources=jOOQ-src\jooq-meta-extensions-%VERSION%-sources.jar
   set SOURCES_JOOQ_CODEGEN=-Dsources=jOOQ-src\jooq-codegen-%VERSION%-sources.jar
   set SOURCES_JOOQ_CODEGEN_MAVEN=-Dsources=jOOQ-src\jooq-codegen-maven-%VERSION%-sources.jar
+  rem [java-8]
   set SOURCES_JOOQ_CHECKER=-Dsources=jOOQ-src\jooq-checker-%VERSION%-sources.jar
+  rem [/java-8]
   set SOURCES_JOOQ_SCALA=-Dsources=jOOQ-src\jooq-scala-%VERSION%-sources.jar
 )
 
@@ -27,7 +31,9 @@ call mvn install:install-file -Dfile=jOOQ-lib\jooq-meta-%VERSION%.jar
 call mvn install:install-file -Dfile=jOOQ-lib\jooq-meta-extensions-%VERSION%.jar -DgroupId=org.jooq -DartifactId=jooq-meta-extensions -Dversion=%VERSION% -Dpackaging=jar %JAVADOC_JOOQ_META_EXTENSIONS% %SOURCES_JOOQ_META_EXTENSIONS% -DpomFile=jOOQ-pom\jooq-meta-extensions\pom.xml
 call mvn install:install-file -Dfile=jOOQ-lib\jooq-codegen-%VERSION%.jar         -DgroupId=org.jooq -DartifactId=jooq-codegen         -Dversion=%VERSION% -Dpackaging=jar %JAVADOC_JOOQ_CODEGEN%         %SOURCES_JOOQ_CODEGEN%         -DpomFile=jOOQ-pom\jooq-codegen\pom.xml
 call mvn install:install-file -Dfile=jOOQ-lib\jooq-codegen-maven-%VERSION%.jar   -DgroupId=org.jooq -DartifactId=jooq-codegen-maven   -Dversion=%VERSION% -Dpackaging=jar %JAVADOC_JOOQ_CODEGEN_MAVEN%   %SOURCES_JOOQ_CODEGEN_META%    -DpomFile=jOOQ-pom\jooq-codegen-maven\pom.xml
+rem [java-8]
 call mvn install:install-file -Dfile=jOOQ-lib\jooq-checker-%VERSION%.jar         -DgroupId=org.jooq -DartifactId=jooq-checker         -Dversion=%VERSION% -Dpackaging=jar %JAVADOC_JOOQ_CHECKER%         %SOURCES_JOOQ_CHECKER%         -DpomFile=jOOQ-pom\jooq-checker\pom.xml
+rem [/java-8]
 call mvn install:install-file -Dfile=jOOQ-lib\jooq-scala-%VERSION%.jar           -DgroupId=org.jooq -DartifactId=jooq-scala           -Dversion=%VERSION% -Dpackaging=jar %JAVADOC_JOOQ_SCALA%           %SOURCES_JOOQ_SCALA%           -DpomFile=jOOQ-pom\jooq-scala\pom.xml
 
 echo
diff --git a/jOOQ-release/release/template/maven-install.sh b/jOOQ-release/release/template/maven-install.sh
index a6e1e65112..ee71f93cbd 100644
--- a/jOOQ-release/release/template/maven-install.sh
+++ b/jOOQ-release/release/template/maven-install.sh
@@ -7,7 +7,9 @@ if [ -f jOOQ-javadoc/jooq-$VERSION-javadoc.jar ]; then
   JAVADOC_JOOQ_META_EXTENSIONS=-Djavadoc=jOOQ-javadoc/jooq-meta-extensions-$VERSION-javadoc.jar
   JAVADOC_JOOQ_CODEGEN=-Djavadoc=jOOQ-javadoc/jooq-codegen-$VERSION-javadoc.jar
   JAVADOC_JOOQ_CODEGEN_MAVEN=-Djavadoc=jOOQ-javadoc/jooq-codegen-maven-$VERSION-javadoc.jar
+  # [java-8]
   JAVADOC_JOOQ_CHECKER=-Djavadoc=jOOQ-javadoc/jooq-checker-$VERSION-javadoc.jar
+  # [/java-8]
   JAVADOC_JOOQ_SCALA=-Djavadoc=jOOQ-javadoc/jooq-scala-$VERSION-javadoc.jar
 fi
 
@@ -17,7 +19,9 @@ if [ -f jOOQ-src/jooq-$VERSION-sources.jar ]; then
   SOURCES_JOOQ_META_EXTENSIONS=-Dsources=jOOQ-src/jooq-meta-extensions-$VERSION-sources.jar
   SOURCES_JOOQ_CODEGEN=-Dsources=jOOQ-src/jooq-codegen-$VERSION-sources.jar
   SOURCES_JOOQ_CODEGEN_MAVEN=-Dsources=jOOQ-src/jooq-codegen-maven-$VERSION-sources.jar
+  # [java-8]
   SOURCES_JOOQ_CHECKER=-Dsources=jOOQ-src/jooq-checker-$VERSION-sources.jar
+  # [/java-8]
   SOURCES_JOOQ_SCALA=-Dsources=jOOQ-src/jooq-scala-$VERSION-sources.jar
 fi
 
@@ -27,7 +31,9 @@ mvn install:install-file -Dfile=jOOQ-lib/jooq-meta-$VERSION.jar            -Dgro
 mvn install:install-file -Dfile=jOOQ-lib/jooq-meta-extensions-$VERSION.jar -DgroupId=org.jooq -DartifactId=jooq-meta-extensions -Dversion=$VERSION -Dpackaging=jar $JAVADOC_JOOQ_META_EXTENSIONS $SOURCES_JOOQ_META_EXTENSIONS -DpomFile=jOOQ-pom/jooq-meta-extensions/pom.xml
 mvn install:install-file -Dfile=jOOQ-lib/jooq-codegen-$VERSION.jar         -DgroupId=org.jooq -DartifactId=jooq-codegen         -Dversion=$VERSION -Dpackaging=jar $JAVADOC_JOOQ_CODEGEN         $SOURCES_JOOQ_CODEGEN         -DpomFile=jOOQ-pom/jooq-codegen/pom.xml
 mvn install:install-file -Dfile=jOOQ-lib/jooq-codegen-maven-$VERSION.jar   -DgroupId=org.jooq -DartifactId=jooq-codegen-maven   -Dversion=$VERSION -Dpackaging=jar $JAVADOC_JOOQ_CODEGEN_MAVEN   $SOURCES_JOOQ_CODEGEN_META    -DpomFile=jOOQ-pom/jooq-codegen-maven/pom.xml
+# [java-8]
 mvn install:install-file -Dfile=jOOQ-lib/jooq-checker-$VERSION.jar         -DgroupId=org.jooq -DartifactId=jooq-checker         -Dversion=$VERSION -Dpackaging=jar $JAVADOC_JOOQ_CHEKER          $SOURCES_JOOQ_CHECKER         -DpomFile=jOOQ-pom/jooq-checker/pom.xml
+# [/java-8]
 mvn install:install-file -Dfile=jOOQ-lib/jooq-scala-$VERSION.jar           -DgroupId=org.jooq -DartifactId=jooq-scala           -Dversion=$VERSION -Dpackaging=jar $JAVADOC_JOOQ_SCALA           $SOURCES_JOOQ_SCALA           -DpomFile=jOOQ-pom/jooq-scala/pom.xml
 
 echo
diff --git a/pom.xml b/pom.xml
index 41052bac5b..01e5a509e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,7 +163,9 @@
 
     <modules>
         <module>jOOQ</module>
+        <!-- [java-8] -->
         <module>jOOQ-checker</module>
+        <!-- [/java-8] -->
         <module>jOOQ-codegen</module>
         <module>jOOQ-codegen-maven</module>
         <module>jOOQ-meta</module>