diff --git a/jOOQ-meta-kotlin/.gitignore b/jOOQ-meta-kotlin/.gitignore
new file mode 100644
index 0000000000..41b88d42d8
--- /dev/null
+++ b/jOOQ-meta-kotlin/.gitignore
@@ -0,0 +1,6 @@
+/target
+
+/.cache
+
+/.idea
+/*.iml
\ No newline at end of file
diff --git a/jOOQ-meta-kotlin/LICENSE.txt b/jOOQ-meta-kotlin/LICENSE.txt
new file mode 100644
index 0000000000..84f48a6df9
--- /dev/null
+++ b/jOOQ-meta-kotlin/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
+
+ https://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: https://www.jooq.org/legal/licensing
\ No newline at end of file
diff --git a/jOOQ-meta-kotlin/NOTICE.txt b/jOOQ-meta-kotlin/NOTICE.txt
new file mode 100644
index 0000000000..698edf47ee
--- /dev/null
+++ b/jOOQ-meta-kotlin/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-meta-kotlin/pom.xml b/jOOQ-meta-kotlin/pom.xml
new file mode 100644
index 0000000000..79a7928dd5
--- /dev/null
+++ b/jOOQ-meta-kotlin/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-parent</artifactId>
+        <version>3.19.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jooq-meta-kotlin</artifactId>
+    <name>jOOQ Meta Kotlin</name>
+
+    <build>
+        <sourceDirectory>src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>src/test/kotlin</testSourceDirectory>
+        <plugins>
+            <plugin>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <groupId>org.jetbrains.kotlin</groupId>
+            </plugin>
+            
+            <!-- The jar plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>empty-javadoc-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>javadoc</classifier>
+                            <classesDirectory>${basedir}/javadoc</classesDirectory>
+                            <archive>
+                                <manifestEntries>
+                                    <Automatic-Module-Name>org.jooq.meta.kotlin</Automatic-Module-Name>
+                                </manifestEntries>
+                            </archive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jooq</groupId>
+            <artifactId>jooq-meta</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+        </dependency>
+
+        <!-- Needed for mapping into Kotlin data classes -->
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-reflect</artifactId>
+        </dependency>
+
+
+
+
+
+
+
+
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/jOOQ-meta-kotlin/src/main/kotlin/org/jooq/meta/kotlin/Extensions.kt b/jOOQ-meta-kotlin/src/main/kotlin/org/jooq/meta/kotlin/Extensions.kt
new file mode 100644
index 0000000000..ec3ebf4104
--- /dev/null
+++ b/jOOQ-meta-kotlin/src/main/kotlin/org/jooq/meta/kotlin/Extensions.kt
@@ -0,0 +1,415 @@
+package org.jooq.meta.kotlin
+
+import org.jooq.meta.jaxb.*
+import org.jooq.meta.jaxb.Target
+
+// ----------------------------------------------------------------------------
+// Extensions to the jOOQ-meta Configuration object hierarchy
+// ----------------------------------------------------------------------------
+
+fun configuration(block: Configuration.() -> Unit): Configuration {
+    val c = Configuration()
+    block(c)
+    return c
+}
+
+// [jooq-tools] START [jooq-meta]
+
+fun Configuration.jdbc(block: Jdbc.() -> Unit) {
+    if (jdbc == null)
+        jdbc = Jdbc()
+
+    block(jdbc)
+}
+
+fun Jdbc.properties(block: MutableList<Property>.() -> Unit) {
+    block(properties)
+}
+
+@JvmName("mutableListProperty")
+fun MutableList<Property>.property(block: Property.() -> Unit) {
+    val e = Property()
+    block(e)
+    add(e)
+}
+
+fun Configuration.generator(block: Generator.() -> Unit) {
+    if (generator == null)
+        generator = Generator()
+
+    block(generator)
+}
+
+fun Generator.strategy(block: Strategy.() -> Unit) {
+    if (strategy == null)
+        strategy = Strategy()
+
+    block(strategy)
+}
+
+fun Strategy.matchers(block: Matchers.() -> Unit) {
+    if (matchers == null)
+        matchers = Matchers()
+
+    block(matchers)
+}
+
+fun Matchers.catalogs(block: MutableList<MatchersCatalogType>.() -> Unit) {
+    block(catalogs)
+}
+
+@JvmName("mutableListMatchersCatalogType")
+fun MutableList<MatchersCatalogType>.catalog(block: MatchersCatalogType.() -> Unit) {
+    val e = MatchersCatalogType()
+    block(e)
+    add(e)
+}
+
+fun MatchersCatalogType.catalogClass(block: MatcherRule.() -> Unit) {
+    if (catalogClass == null)
+        catalogClass = MatcherRule()
+
+    block(catalogClass)
+}
+
+fun Matchers.schemas(block: MutableList<MatchersSchemaType>.() -> Unit) {
+    block(schemas)
+}
+
+@JvmName("mutableListMatchersSchemaType")
+fun MutableList<MatchersSchemaType>.schema(block: MatchersSchemaType.() -> Unit) {
+    val e = MatchersSchemaType()
+    block(e)
+    add(e)
+}
+
+fun Matchers.tables(block: MutableList<MatchersTableType>.() -> Unit) {
+    block(tables)
+}
+
+@JvmName("mutableListMatchersTableType")
+fun MutableList<MatchersTableType>.table(block: MatchersTableType.() -> Unit) {
+    val e = MatchersTableType()
+    block(e)
+    add(e)
+}
+
+fun Matchers.foreignKeys(block: MutableList<MatchersForeignKeyType>.() -> Unit) {
+    block(foreignKeys)
+}
+
+@JvmName("mutableListMatchersForeignKeyType")
+fun MutableList<MatchersForeignKeyType>.foreignKey(block: MatchersForeignKeyType.() -> Unit) {
+    val e = MatchersForeignKeyType()
+    block(e)
+    add(e)
+}
+
+fun Matchers.fields(block: MutableList<MatchersFieldType>.() -> Unit) {
+    block(fields)
+}
+
+@JvmName("mutableListMatchersFieldType")
+fun MutableList<MatchersFieldType>.field(block: MatchersFieldType.() -> Unit) {
+    val e = MatchersFieldType()
+    block(e)
+    add(e)
+}
+
+fun Matchers.routines(block: MutableList<MatchersRoutineType>.() -> Unit) {
+    block(routines)
+}
+
+@JvmName("mutableListMatchersRoutineType")
+fun MutableList<MatchersRoutineType>.routine(block: MatchersRoutineType.() -> Unit) {
+    val e = MatchersRoutineType()
+    block(e)
+    add(e)
+}
+
+fun Matchers.sequences(block: MutableList<MatchersSequenceType>.() -> Unit) {
+    block(sequences)
+}
+
+@JvmName("mutableListMatchersSequenceType")
+fun MutableList<MatchersSequenceType>.sequence(block: MatchersSequenceType.() -> Unit) {
+    val e = MatchersSequenceType()
+    block(e)
+    add(e)
+}
+
+fun Matchers.enums(block: MutableList<MatchersEnumType>.() -> Unit) {
+    block(enums)
+}
+
+@JvmName("mutableListMatchersEnumType")
+fun MutableList<MatchersEnumType>.enum(block: MatchersEnumType.() -> Unit) {
+    val e = MatchersEnumType()
+    block(e)
+    add(e)
+}
+
+fun Matchers.embeddables(block: MutableList<MatchersEmbeddableType>.() -> Unit) {
+    block(embeddables)
+}
+
+@JvmName("mutableListMatchersEmbeddableType")
+fun MutableList<MatchersEmbeddableType>.embeddable(block: MatchersEmbeddableType.() -> Unit) {
+    val e = MatchersEmbeddableType()
+    block(e)
+    add(e)
+}
+
+fun Generator.database(block: Database.() -> Unit) {
+    if (database == null)
+        database = Database()
+
+    block(database)
+}
+
+fun Database.syntheticObjects(block: SyntheticObjectsType.() -> Unit) {
+    if (syntheticObjects == null)
+        syntheticObjects = SyntheticObjectsType()
+
+    block(syntheticObjects)
+}
+
+fun SyntheticObjectsType.readonlyColumns(block: MutableList<SyntheticReadonlyColumnType>.() -> Unit) {
+    block(readonlyColumns)
+}
+
+@JvmName("mutableListSyntheticReadonlyColumnType")
+fun MutableList<SyntheticReadonlyColumnType>.readonlyColumn(block: SyntheticReadonlyColumnType.() -> Unit) {
+    val e = SyntheticReadonlyColumnType()
+    block(e)
+    add(e)
+}
+
+fun SyntheticObjectsType.readonlyRowids(block: MutableList<SyntheticReadonlyRowidType>.() -> Unit) {
+    block(readonlyRowids)
+}
+
+@JvmName("mutableListSyntheticReadonlyRowidType")
+fun MutableList<SyntheticReadonlyRowidType>.readonlyRowid(block: SyntheticReadonlyRowidType.() -> Unit) {
+    val e = SyntheticReadonlyRowidType()
+    block(e)
+    add(e)
+}
+
+fun SyntheticObjectsType.columns(block: MutableList<SyntheticColumnType>.() -> Unit) {
+    block(columns)
+}
+
+@JvmName("mutableListSyntheticColumnType")
+fun MutableList<SyntheticColumnType>.column(block: SyntheticColumnType.() -> Unit) {
+    val e = SyntheticColumnType()
+    block(e)
+    add(e)
+}
+
+fun SyntheticObjectsType.identities(block: MutableList<SyntheticIdentityType>.() -> Unit) {
+    block(identities)
+}
+
+@JvmName("mutableListSyntheticIdentityType")
+fun MutableList<SyntheticIdentityType>.identity(block: SyntheticIdentityType.() -> Unit) {
+    val e = SyntheticIdentityType()
+    block(e)
+    add(e)
+}
+
+fun SyntheticObjectsType.enums(block: MutableList<SyntheticEnumType>.() -> Unit) {
+    block(enums)
+}
+
+@JvmName("mutableListSyntheticEnumType")
+fun MutableList<SyntheticEnumType>.enum(block: SyntheticEnumType.() -> Unit) {
+    val e = SyntheticEnumType()
+    block(e)
+    add(e)
+}
+
+fun SyntheticObjectsType.primaryKeys(block: MutableList<SyntheticPrimaryKeyType>.() -> Unit) {
+    block(primaryKeys)
+}
+
+@JvmName("mutableListSyntheticPrimaryKeyType")
+fun MutableList<SyntheticPrimaryKeyType>.primaryKey(block: SyntheticPrimaryKeyType.() -> Unit) {
+    val e = SyntheticPrimaryKeyType()
+    block(e)
+    add(e)
+}
+
+fun SyntheticObjectsType.uniqueKeys(block: MutableList<SyntheticUniqueKeyType>.() -> Unit) {
+    block(uniqueKeys)
+}
+
+@JvmName("mutableListSyntheticUniqueKeyType")
+fun MutableList<SyntheticUniqueKeyType>.uniqueKey(block: SyntheticUniqueKeyType.() -> Unit) {
+    val e = SyntheticUniqueKeyType()
+    block(e)
+    add(e)
+}
+
+fun SyntheticObjectsType.foreignKeys(block: MutableList<SyntheticForeignKeyType>.() -> Unit) {
+    block(foreignKeys)
+}
+
+@JvmName("mutableListSyntheticForeignKeyType")
+fun MutableList<SyntheticForeignKeyType>.foreignKey(block: SyntheticForeignKeyType.() -> Unit) {
+    val e = SyntheticForeignKeyType()
+    block(e)
+    add(e)
+}
+
+fun SyntheticObjectsType.views(block: MutableList<SyntheticViewType>.() -> Unit) {
+    block(views)
+}
+
+@JvmName("mutableListSyntheticViewType")
+fun MutableList<SyntheticViewType>.view(block: SyntheticViewType.() -> Unit) {
+    val e = SyntheticViewType()
+    block(e)
+    add(e)
+}
+
+fun SyntheticObjectsType.daos(block: MutableList<SyntheticDaoType>.() -> Unit) {
+    block(daos)
+}
+
+@JvmName("mutableListSyntheticDaoType")
+fun MutableList<SyntheticDaoType>.dao(block: SyntheticDaoType.() -> Unit) {
+    val e = SyntheticDaoType()
+    block(e)
+    add(e)
+}
+
+fun SyntheticDaoType.methods(block: MutableList<SyntheticDaoMethodType>.() -> Unit) {
+    block(methods)
+}
+
+@JvmName("mutableListSyntheticDaoMethodType")
+fun MutableList<SyntheticDaoMethodType>.method(block: SyntheticDaoMethodType.() -> Unit) {
+    val e = SyntheticDaoMethodType()
+    block(e)
+    add(e)
+}
+
+fun Database.properties(block: MutableList<Property>.() -> Unit) {
+    block(properties)
+}
+
+fun Database.comments(block: MutableList<CommentType>.() -> Unit) {
+    block(comments)
+}
+
+@JvmName("mutableListCommentType")
+fun MutableList<CommentType>.comment(block: CommentType.() -> Unit) {
+    val e = CommentType()
+    block(e)
+    add(e)
+}
+
+fun Database.catalogs(block: MutableList<CatalogMappingType>.() -> Unit) {
+    block(catalogs)
+}
+
+@JvmName("mutableListCatalogMappingType")
+fun MutableList<CatalogMappingType>.catalog(block: CatalogMappingType.() -> Unit) {
+    val e = CatalogMappingType()
+    block(e)
+    add(e)
+}
+
+fun CatalogMappingType.schemata(block: MutableList<SchemaMappingType>.() -> Unit) {
+    block(schemata)
+}
+
+@JvmName("mutableListSchemaMappingType")
+fun MutableList<SchemaMappingType>.schema(block: SchemaMappingType.() -> Unit) {
+    val e = SchemaMappingType()
+    block(e)
+    add(e)
+}
+
+fun Database.schemata(block: MutableList<SchemaMappingType>.() -> Unit) {
+    block(schemata)
+}
+
+fun Database.embeddables(block: MutableList<EmbeddableDefinitionType>.() -> Unit) {
+    block(embeddables)
+}
+
+@JvmName("mutableListEmbeddableDefinitionType")
+fun MutableList<EmbeddableDefinitionType>.embeddable(block: EmbeddableDefinitionType.() -> Unit) {
+    val e = EmbeddableDefinitionType()
+    block(e)
+    add(e)
+}
+
+fun EmbeddableDefinitionType.fields(block: MutableList<EmbeddableField>.() -> Unit) {
+    block(fields)
+}
+
+@JvmName("mutableListEmbeddableField")
+fun MutableList<EmbeddableField>.field(block: EmbeddableField.() -> Unit) {
+    val e = EmbeddableField()
+    block(e)
+    add(e)
+}
+
+fun Database.customTypes(block: MutableList<CustomType>.() -> Unit) {
+    block(customTypes)
+}
+
+@JvmName("mutableListCustomType")
+fun MutableList<CustomType>.customType(block: CustomType.() -> Unit) {
+    val e = CustomType()
+    block(e)
+    add(e)
+}
+
+fun CustomType.lambdaConverter(block: LambdaConverter.() -> Unit) {
+    if (lambdaConverter == null)
+        lambdaConverter = LambdaConverter()
+
+    block(lambdaConverter)
+}
+
+fun Database.enumTypes(block: MutableList<EnumType>.() -> Unit) {
+    block(enumTypes)
+}
+
+@JvmName("mutableListEnumType")
+fun MutableList<EnumType>.enumType(block: EnumType.() -> Unit) {
+    val e = EnumType()
+    block(e)
+    add(e)
+}
+
+fun Database.forcedTypes(block: MutableList<ForcedType>.() -> Unit) {
+    block(forcedTypes)
+}
+
+@JvmName("mutableListForcedType")
+fun MutableList<ForcedType>.forcedType(block: ForcedType.() -> Unit) {
+    val e = ForcedType()
+    block(e)
+    add(e)
+}
+
+fun Generator.generate(block: Generate.() -> Unit) {
+    if (generate == null)
+        generate = Generate()
+
+    block(generate)
+}
+
+fun Generator.target(block: Target.() -> Unit) {
+    if (target == null)
+        target = Target()
+
+    block(target)
+}
+
+// [jooq-tools] END [jooq-meta]
diff --git a/jOOQ-meta-kotlin/src/main/resources/META-INF/LICENSE.txt b/jOOQ-meta-kotlin/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000000..84f48a6df9
--- /dev/null
+++ b/jOOQ-meta-kotlin/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
+
+ https://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: https://www.jooq.org/legal/licensing
\ No newline at end of file
diff --git a/jOOQ-meta-kotlin/src/main/resources/META-INF/README.txt b/jOOQ-meta-kotlin/src/main/resources/META-INF/README.txt
new file mode 100644
index 0000000000..3e6e227e05
--- /dev/null
+++ b/jOOQ-meta-kotlin/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