diff --git a/jOOQ-xtend/.gitignore b/jOOQ-xtend/.gitignore
new file mode 100644
index 0000000000..b83d22266a
--- /dev/null
+++ b/jOOQ-xtend/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/jOOQ-xtend/LICENSE.txt b/jOOQ-xtend/LICENSE.txt
new file mode 100644
index 0000000000..d090694f44
--- /dev/null
+++ b/jOOQ-xtend/LICENSE.txt
@@ -0,0 +1,19 @@
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Other licenses:
+-----------------------------------------------------------------------------
+Commercial licenses for this work are available. These replace the above
+ASL 2.0 and offer limited warranties, support, maintenance, and commercial
+database integrations.
+
+For more information, please visit: http://www.jooq.org/licenses
\ No newline at end of file
diff --git a/jOOQ-xtend/NOTICE.txt b/jOOQ-xtend/NOTICE.txt
new file mode 100644
index 0000000000..698edf47ee
--- /dev/null
+++ b/jOOQ-xtend/NOTICE.txt
@@ -0,0 +1,10 @@
+Third party NOTICE.txt contents
+===============================
+
+Contents of https://github.com/apache/commons-lang/blob/master/NOTICE.txt
+-------------------------------------------------------------------------
+Apache Commons Lang
+Copyright 2001-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/jOOQ-xtend/pom.xml b/jOOQ-xtend/pom.xml
new file mode 100644
index 0000000000..11dc94030e
--- /dev/null
+++ b/jOOQ-xtend/pom.xml
@@ -0,0 +1,97 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-parent</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jooq-xtend</artifactId>
+    <name>jOOQ Xtend</name>
+
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.jooq.org/inc/LICENSE.txt</url>
+            <distribution>repo</distribution>
+        </license>
+
+
+
+
+
+
+
+    </licenses>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>org.jooq.xtend</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+
+
+
+
+                    <!-- IntelliJ needs these https://youtrack.jetbrains.com/issue/IDEA-195472 -->
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.eclipse.xtend</groupId>
+                <artifactId>xtend-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                            <goal>testCompile</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/xtend-gen/main</outputDirectory>
+                            <testOutputDirectory>${project.build.directory}/xtend-gen/test</testOutputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jooq</groupId>
+            <artifactId>jooq</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.xtend</groupId>
+            <artifactId>org.eclipse.xtend.lib</artifactId>
+        </dependency>
+
+
+
+
+
+
+
+
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/jOOQ-xtend/src/main/xtend/org/jooq/xtend/Conversions.xtend b/jOOQ-xtend/src/main/java/org/jooq/xtend/Conversions.xtend
similarity index 99%
rename from jOOQ-xtend/src/main/xtend/org/jooq/xtend/Conversions.xtend
rename to jOOQ-xtend/src/main/java/org/jooq/xtend/Conversions.xtend
index 3abe27655f..2d06d9dbc5 100644
--- a/jOOQ-xtend/src/main/xtend/org/jooq/xtend/Conversions.xtend
+++ b/jOOQ-xtend/src/main/java/org/jooq/xtend/Conversions.xtend
@@ -37,8 +37,6 @@
  */
 package org.jooq.xtend
 
-import javax.annotation.Generated
-
 import org.jooq.Condition
 import org.jooq.Field
 import org.jooq.QuantifiedSelect
@@ -65,7 +63,6 @@ import org.jooq.Record19
 import org.jooq.Record20
 import org.jooq.Record21
 import org.jooq.Record22
-import org.jooq.Row
 import org.jooq.RowN
 import org.jooq.Row1
 import org.jooq.Row2
@@ -99,7 +96,6 @@ import org.jooq.impl.DSL
  * @author Lukas Eder
  * @see <a href="http://www.eclipse.org/xtend/documentation.html#operators">http://www.eclipse.org/xtend/documentation.html#operators</a>
  */
-@Generated("This class was generated using jOOQ-tools")
 class Conversions {
 
     def static <T> operator_or(Condition c1, Condition c2) {
diff --git a/jOOQ-xtend/src/main/resources/META-INF/LICENSE.txt b/jOOQ-xtend/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000000..d090694f44
--- /dev/null
+++ b/jOOQ-xtend/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,19 @@
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Other licenses:
+-----------------------------------------------------------------------------
+Commercial licenses for this work are available. These replace the above
+ASL 2.0 and offer limited warranties, support, maintenance, and commercial
+database integrations.
+
+For more information, please visit: http://www.jooq.org/licenses
\ No newline at end of file
diff --git a/jOOQ-xtend/src/main/resources/META-INF/README.txt b/jOOQ-xtend/src/main/resources/META-INF/README.txt
new file mode 100644
index 0000000000..3e6e227e05
--- /dev/null
+++ b/jOOQ-xtend/src/main/resources/META-INF/README.txt
@@ -0,0 +1,2 @@
+Thanks for downloading jOOQ.
+Please visit http://www.jooq.org for more information.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 62eff326c2..ae7d0a5d32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,6 +117,18 @@
 
 
 
+            <dependency>
+                <groupId>org.jooq</groupId>
+                <artifactId>jooq-xtend</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.eclipse.xtend</groupId>
+                <artifactId>org.eclipse.xtend.lib</artifactId>
+                <version>2.20.0</version>
+            </dependency>
+
             <!-- From JDK 9 onwards, the JAXB dependency needs to be made explicit -->
             <!-- The dependency can cause trouble in older JDKs, so it needs to be
                  excluded from pre-java-9 builds: https://github.com/jOOQ/jOOQ/issues/7649 -->
@@ -412,6 +424,16 @@
                     <version>4.3.0</version>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.eclipse.xtend</groupId>
+                    <artifactId>xtend-maven-plugin</artifactId>
+                    <version>2.20.0</version>
+
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -479,6 +501,10 @@
 
 
 
+        <module>jOOQ-xtend</module>
+
+
+