diff --git a/jOOQ-website/manual-pdf/jOOQ-manual.fo.xml b/jOOQ-website/manual-pdf/jOOQ-manual.fo.xml
index 0833c2592e..2494982197 100644
--- a/jOOQ-website/manual-pdf/jOOQ-manual.fo.xml
+++ b/jOOQ-website/manual-pdf/jOOQ-manual.fo.xml
@@ -1131,7 +1131,7 @@ CREATE TABLE t_book_to_book_store (
 </fo:list-item-label>
 <fo:list-item-body start-indent="body-start()">
 <fo:block font-size="11pt" page-break-inside="avoid">From the settings defaults, as specified in
-								    <fo:basic-link font-size="11pt" color="#882222" font-weight="bold" text-shadow="0 1px 2px #666666" external-destination="url('http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd')">http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd</fo:basic-link>
+								    <fo:basic-link font-size="11pt" color="#882222" font-weight="bold" text-shadow="0 1px 2px #666666" external-destination="url('http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd')">http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd</fo:basic-link>
 								</fo:block>
 </fo:list-item-body>
 </fo:list-item>
@@ -1166,7 +1166,7 @@ CREATE TABLE t_book_to_book_store (
 </fo:block>
 							<fo:block font-size="11pt">
 								Please refer to the jOOQ runtime configuration XSD for more details:<fo:block/>
-								<fo:basic-link font-size="11pt" color="#882222" font-weight="bold" text-shadow="0 1px 2px #666666" external-destination="url('http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd')">http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd</fo:basic-link>
+								<fo:basic-link font-size="11pt" color="#882222" font-weight="bold" text-shadow="0 1px 2px #666666" external-destination="url('http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd')">http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd</fo:basic-link>
 							</fo:block>
 
 							<fo:block font-family="Georgia" font-size="16pt" padding-top="10pt" padding-bottom="10pt" page-break-after="avoid">Factory subclasses</fo:block>
@@ -2786,7 +2786,7 @@ public void bind(BindContext context) throws DataAccessException;</fo:block>
 								There are also lots of advanced configuration parameters, which will be
 								treated in the <fo:basic-link font-size="11pt" color="#882222" font-weight="bold" text-shadow="0 1px 2px #666666" internal-destination="AdvancedConfiguration">manual's next section</fo:basic-link>
 								Note, you can find the official XSD file at
-							   <fo:basic-link font-size="11pt" color="#882222" font-weight="bold" text-shadow="0 1px 2px #666666" external-destination="url('http://www.jooq.org/xsd/jooq-codegen-2.0.4.xsd')">http://www.jooq.org/xsd/jooq-codegen-2.0.4.xsd</fo:basic-link>
+							   <fo:basic-link font-size="11pt" color="#882222" font-weight="bold" text-shadow="0 1px 2px #666666" external-destination="url('http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd')">http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd</fo:basic-link>
 							   for a formal specification</fo:block>
 
 							<fo:block font-family="Georgia" font-size="16pt" padding-top="10pt" padding-bottom="10pt" page-break-after="avoid">Run jOOQ code generation</fo:block>
@@ -6192,7 +6192,7 @@ create.selectFrom(T_AUTHOR).fetch();</fo:block>
 								their own LOG schema instance. Then you can enhance your RenderMapping
 								like this (e.g. using an XML configuration file): </fo:block>
 
-<fo:block font-family="Courier" linefeed-treatment="preserve" white-space-collapse="false" white-space-treatment="preserve" font-size="6pt" margin="12pt" padding="4pt" border="2px solid #882222" background-color="#FFEEDD" page-break-inside="avoid"><![CDATA[<settings xmlns="http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd">
+<fo:block font-family="Courier" linefeed-treatment="preserve" white-space-collapse="false" white-space-treatment="preserve" font-size="6pt" margin="12pt" padding="4pt" border="2px solid #882222" background-color="#FFEEDD" page-break-inside="avoid"><![CDATA[<settings xmlns="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd">
   <renderMapping>
     <schemata>
       <schema>
diff --git a/jOOQ-website/manual-pdf/jOOQ-manual.pdf b/jOOQ-website/manual-pdf/jOOQ-manual.pdf
index a5f32045a3..cf100b9611 100644
Binary files a/jOOQ-website/manual-pdf/jOOQ-manual.pdf and b/jOOQ-website/manual-pdf/jOOQ-manual.pdf differ
diff --git a/jOOQ-website/manual-single-page/index.php b/jOOQ-website/manual-single-page/index.php
index fcc4963b4e..5f1a2228e7 100644
--- a/jOOQ-website/manual-single-page/index.php
+++ b/jOOQ-website/manual-single-page/index.php
@@ -379,7 +379,7 @@ CREATE TABLE t_book_to_book_store (
 <li>From the classpath at /jooq-settings.xml</li>
 								
 <li>From the settings defaults, as specified in
-								    <a href="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd" title="The jOOQ Runtime configuration XSD">http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd</a>
+								    <a href="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd" title="The jOOQ Runtime configuration XSD">http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd</a>
 								
 </li>
 							
@@ -405,7 +405,7 @@ CREATE TABLE t_book_to_book_store (
 							<p>
 								Please refer to the jOOQ runtime configuration XSD for more details:<br>
 								
-<a href="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd" title="The jOOQ Runtime configuration XSD">http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd</a>
+<a href="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd" title="The jOOQ Runtime configuration XSD">http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd</a>
 							
 </p>
 
@@ -1750,7 +1750,7 @@ public void bind(BindContext context) throws DataAccessException;</pre>
 								There are also lots of advanced configuration parameters, which will be
 								treated in the <a href="#AdvancedConfiguration" title="jOOQ Manual reference: Advanced configuration of the generator">manual's next section</a>
 								Note, you can find the official XSD file at
-							   <a href="http://www.jooq.org/xsd/jooq-codegen-2.0.4.xsd" title="The jOOQ-codegen configuration XSD">http://www.jooq.org/xsd/jooq-codegen-2.0.4.xsd</a>
+							   <a href="http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd" title="The jOOQ-codegen configuration XSD">http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd</a>
 							   for a formal specification</p>
 
 							<h2>Run jOOQ code generation</h2>
@@ -4612,7 +4612,7 @@ create.selectFrom(T_AUTHOR).fetch();</pre>
 								their own LOG schema instance. Then you can enhance your RenderMapping
 								like this (e.g. using an XML configuration file): </p>
 
-<pre class="prettyprint lang-xml">&lt;settings xmlns="http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd"&gt;
+<pre class="prettyprint lang-xml">&lt;settings xmlns="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd"&gt;
   &lt;renderMapping&gt;
     &lt;schemata&gt;
       &lt;schema&gt;
diff --git a/jOOQ-website/manual/ADVANCED/SchemaMapping/index.php b/jOOQ-website/manual/ADVANCED/SchemaMapping/index.php
index e620157c6c..4cdd8ebdb4 100644
--- a/jOOQ-website/manual/ADVANCED/SchemaMapping/index.php
+++ b/jOOQ-website/manual/ADVANCED/SchemaMapping/index.php
@@ -78,7 +78,7 @@ create.selectFrom(T_AUTHOR).fetch();</pre>
 								their own LOG schema instance. Then you can enhance your RenderMapping
 								like this (e.g. using an XML configuration file): </p>
 
-<pre class="prettyprint lang-xml">&lt;settings xmlns="http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd"&gt;
+<pre class="prettyprint lang-xml">&lt;settings xmlns="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd"&gt;
   &lt;renderMapping&gt;
     &lt;schemata&gt;
       &lt;schema&gt;
diff --git a/jOOQ-website/manual/JOOQ/Factory/index.php b/jOOQ-website/manual/JOOQ/Factory/index.php
index 330156c4da..5f69c6e4ce 100644
--- a/jOOQ-website/manual/JOOQ/Factory/index.php
+++ b/jOOQ-website/manual/JOOQ/Factory/index.php
@@ -81,7 +81,7 @@ function printContent() {
 <li>From the classpath at /jooq-settings.xml</li>
 								
 <li>From the settings defaults, as specified in
-								    <a href="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd" title="The jOOQ Runtime configuration XSD">http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd</a>
+								    <a href="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd" title="The jOOQ Runtime configuration XSD">http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd</a>
 								
 </li>
 							
@@ -107,7 +107,7 @@ function printContent() {
 							<p>
 								Please refer to the jOOQ runtime configuration XSD for more details:<br>
 								
-<a href="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd" title="The jOOQ Runtime configuration XSD">http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd</a>
+<a href="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd" title="The jOOQ Runtime configuration XSD">http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd</a>
 							
 </p>
 
diff --git a/jOOQ-website/manual/META/Configuration/index.php b/jOOQ-website/manual/META/Configuration/index.php
index 8ef4bf7b6c..260155dd77 100644
--- a/jOOQ-website/manual/META/Configuration/index.php
+++ b/jOOQ-website/manual/META/Configuration/index.php
@@ -149,7 +149,7 @@ function printContent() {
 								There are also lots of advanced configuration parameters, which will be
 								treated in the <a href="<?=$root?>/manual/META/AdvancedConfiguration/" title="jOOQ Manual reference: Advanced configuration of the generator">manual's next section</a>
 								Note, you can find the official XSD file at
-							   <a href="http://www.jooq.org/xsd/jooq-codegen-2.0.4.xsd" title="The jOOQ-codegen configuration XSD">http://www.jooq.org/xsd/jooq-codegen-2.0.4.xsd</a>
+							   <a href="http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd" title="The jOOQ-codegen configuration XSD">http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd</a>
 							   for a formal specification</p>
 
 							<h2>Run jOOQ code generation</h2>
diff --git a/jOOQ-website/src/main/resources/manual.xml b/jOOQ-website/src/main/resources/manual.xml
index 8a12eddd50..eb480809dd 100644
--- a/jOOQ-website/src/main/resources/manual.xml
+++ b/jOOQ-website/src/main/resources/manual.xml
@@ -191,7 +191,7 @@ CREATE TABLE t_book_to_book_store (
 								<li>From a location specified by a JVM parameter: -Dorg.jooq.settings</li>
 								<li>From the classpath at /jooq-settings.xml</li>
 								<li>From the settings defaults, as specified in
-								    <a href="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd" title="The jOOQ Runtime configuration XSD">http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd</a>
+								    <a href="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd" title="The jOOQ Runtime configuration XSD">http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd</a>
 								</li>
 							</ul>
 							<p>
@@ -207,7 +207,7 @@ CREATE TABLE t_book_to_book_store (
    							</ul>
 							<p>
 								Please refer to the jOOQ runtime configuration XSD for more details:<br/>
-								<a href="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd" title="The jOOQ Runtime configuration XSD">http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd</a>
+								<a href="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd" title="The jOOQ Runtime configuration XSD">http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd</a>
 							</p>
 
 							<h3>Factory subclasses</h3>
@@ -1528,7 +1528,7 @@ public void bind(BindContext context) throws DataAccessException;</java>
 								There are also lots of advanced configuration parameters, which will be
 								treated in the <reference id="AdvancedConfiguration" title="manual's next section"/>
 								Note, you can find the official XSD file at
-							   <a href="http://www.jooq.org/xsd/jooq-codegen-2.0.4.xsd" title="The jOOQ-codegen configuration XSD">http://www.jooq.org/xsd/jooq-codegen-2.0.4.xsd</a>
+							   <a href="http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd" title="The jOOQ-codegen configuration XSD">http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd</a>
 							   for a formal specification</p>
 
 							<h2>Run jOOQ code generation</h2>
@@ -4364,7 +4364,7 @@ create.selectFrom(T_AUTHOR).fetch();</java>
 								their own LOG schema instance. Then you can enhance your RenderMapping
 								like this (e.g. using an XML configuration file): </p>
 
-<xml><![CDATA[<settings xmlns="http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd">
+<xml><![CDATA[<settings xmlns="http://www.jooq.org/xsd/jooq-runtime-2.1.0.xsd">
   <renderMapping>
     <schemata>
       <schema>