diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java
index 9231c7d00d..0e2bf202d0 100644
--- a/jOOQ/src/main/java/org/jooq/Constants.java
+++ b/jOOQ/src/main/java/org/jooq/Constants.java
@@ -78,6 +78,16 @@ public final class Constants {
      */
     public static final String NS_RUNTIME     = "http://www.jooq.org/xsd/" + XSD_RUNTIME;
 
+    /**
+     * The current jooq-export XSD file name.
+     */
+    public static final String XSD_EXPORT     = "jooq-export-3.7.0.xsd";
+
+    /**
+     * The current jooq-export XML namespace
+     */
+    public static final String NS_EXPORT      = "http://www.jooq.org/xsd/" + XSD_EXPORT;
+
     /**
      * The current jooq-meta XSD file name.
      */
@@ -91,7 +101,7 @@ public final class Constants {
     /**
      * The current jooq-codegen XSD file name.
      */
-    public static final String XSD_CODEGEN    = "jooq-codegen-3.6.0.xsd";
+    public static final String XSD_CODEGEN    = "jooq-codegen-3.7.0.xsd";
 
     /**
      * The current jooq-codegen XML namespace.
diff --git a/jOOQ/src/main/resources/xsd/jooq-export-2.6.0.xsd b/jOOQ/src/main/resources/xsd/jooq-export-2.6.0.xsd
index 2a74504523..a97f0beb3f 100644
--- a/jOOQ/src/main/resources/xsd/jooq-export-2.6.0.xsd
+++ b/jOOQ/src/main/resources/xsd/jooq-export-2.6.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema
     xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:jooq-export="http://www.jooq.org/xsd/jooq-export-1.6.2.xsd"
-    targetNamespace="http://www.jooq.org/xsd/jooq-export-1.6.2.xsd"
+    xmlns:jooq-export="http://www.jooq.org/xsd/jooq-export-2.6.0.xsd"
+    targetNamespace="http://www.jooq.org/xsd/jooq-export-2.6.0.xsd"
     elementFormDefault="qualified">
 
     <element name="result" type="jooq-export:Result"/>