diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/XMLGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/XMLGenerator.java
index 6655e8db50..64fbb70b57 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/XMLGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/XMLGenerator.java
@@ -47,6 +47,8 @@ import javax.xml.bind.JAXB;
 
 import org.jooq.SortOrder;
 import org.jooq.tools.JooqLogger;
+import org.jooq.tools.StringUtils;
+import org.jooq.util.xml.jaxb.Catalog;
 import org.jooq.util.xml.jaxb.Column;
 import org.jooq.util.xml.jaxb.Index;
 import org.jooq.util.xml.jaxb.IndexColumnUsage;
@@ -89,9 +91,20 @@ public class XMLGenerator extends AbstractGenerator {
 
         InformationSchema is = new InformationSchema();
 
+        boolean hasNonDefaultCatalogs = false;
+        for (CatalogDefinition c : db.getCatalogs()) {
+            if (!StringUtils.isBlank(c.getName())) {
+                hasNonDefaultCatalogs = true;
+                break;
+            }
+        }
+
         for (CatalogDefinition c : db.getCatalogs()) {
             String catalogName = c.getOutputName();
 
+            if (hasNonDefaultCatalogs)
+                is.getCatalogs().add(new Catalog().withCatalogName(catalogName));
+
             for (SchemaDefinition s : c.getSchemata()) {
                 String schemaName = s.getOutputName();