diff --git a/jOOQ-release/build.xml b/jOOQ-release/build.xml
index 1b0f367b83..45e39f194b 100644
--- a/jOOQ-release/build.xml
+++ b/jOOQ-release/build.xml
@@ -15,6 +15,7 @@
         <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"/>
+        <mkdir dir="${dir.release}/${dir.version}/jOOQ-pom/jooq-checker"/>
         <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"/>
@@ -22,6 +23,7 @@
         <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"/>
+        <copy todir="${dir.release}/${dir.version}/jOOQ-lib" file="${dir.workspace}/jOOQ-checker/target/jooq-checker-${version-prefix}.jar"/>
         <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"/>
@@ -29,6 +31,7 @@
         <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"/>
+        <copy todir="${dir.release}/${dir.version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-checker/target/jooq-checker-${version-prefix}-javadoc.jar"/>
         <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"/>
@@ -37,6 +40,7 @@
         <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"/>
+        <copy todir="${dir.release}/${dir.version}/jOOQ-pom/jooq-checker"         file="${dir.workspace}/jOOQ-checker/pom.xml"/>
         <copy todir="${dir.release}/${dir.version}/jOOQ-pom/jooq-scala"           file="${dir.workspace}/jOOQ-scala/pom.xml"/>
     </target>
 
@@ -49,6 +53,7 @@
         <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"/>
+        <copy todir="${dir.release}/${dir.version}/jOOQ-src" file="${dir.workspace}/jOOQ-checker/target/jooq-checker-${version-prefix}-sources.jar"/>
         <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">
@@ -64,6 +69,7 @@
                 <include name="jOOQ-examples/**"/>
                 <include name="jOOQ-meta/**"/>
                 <include name="jOOQ-meta-extensions/**"/>
+                <include name="jOOQ-checker/**"/>
                 <include name="jOOQ-scala/**"/>
                 <include name="authors.txt"/>
                 <include name="LICENSE"/>
diff --git a/jOOQ-release/release/template/maven-install.bat b/jOOQ-release/release/template/maven-install.bat
index 9c98fe47a7..0fbdbf4e0c 100644
--- a/jOOQ-release/release/template/maven-install.bat
+++ b/jOOQ-release/release/template/maven-install.bat
@@ -7,6 +7,7 @@ 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
+  set JAVADOC_JOOQ_CHECKER=-Djavadoc=jOOQ-javadoc\jooq-checker-%VERSION%-javadoc.jar
   set JAVADOC_JOOQ_SCALA=-Djavadoc=jOOQ-javadoc\jooq-scala-%VERSION%-javadoc.jar
 )
 
@@ -16,6 +17,7 @@ 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
+  set SOURCES_JOOQ_CHECKER=-Dsources=jOOQ-src\jooq-checker-%VERSION%-sources.jar
   set SOURCES_JOOQ_SCALA=-Dsources=jOOQ-src\jooq-scala-%VERSION%-sources.jar
 )
 
@@ -25,6 +27,7 @@ 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
+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
 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 558e925d42..a6e1e65112 100644
--- a/jOOQ-release/release/template/maven-install.sh
+++ b/jOOQ-release/release/template/maven-install.sh
@@ -7,6 +7,7 @@ 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
+  JAVADOC_JOOQ_CHECKER=-Djavadoc=jOOQ-javadoc/jooq-checker-$VERSION-javadoc.jar
   JAVADOC_JOOQ_SCALA=-Djavadoc=jOOQ-javadoc/jooq-scala-$VERSION-javadoc.jar
 fi
 
@@ -16,6 +17,7 @@ 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
+  SOURCES_JOOQ_CHECKER=-Dsources=jOOQ-src/jooq-checker-$VERSION-sources.jar
   SOURCES_JOOQ_SCALA=-Dsources=jOOQ-src/jooq-scala-$VERSION-sources.jar
 fi
 
@@ -25,6 +27,7 @@ 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
+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
 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 440644a7d7..41052bac5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,7 @@
 
     <modules>
         <module>jOOQ</module>
+        <module>jOOQ-checker</module>
         <module>jOOQ-codegen</module>
         <module>jOOQ-codegen-maven</module>
         <module>jOOQ-meta</module>