diff --git a/jOOQ/src/main/java/org/jooq/Catalog.java b/jOOQ/src/main/java/org/jooq/Catalog.java
index 9d5cbfae24..959869bf34 100644
--- a/jOOQ/src/main/java/org/jooq/Catalog.java
+++ b/jOOQ/src/main/java/org/jooq/Catalog.java
@@ -38,7 +38,9 @@ package org.jooq;
 import java.util.List;
 
 /**
- * An object representing a database catalog
+ * An object representing a database catalog.
+ * <p>
+ * NOTE: Catalogs are experimental in jOOQ 3.0
  *
  * @author Lukas Eder
  */
diff --git a/jOOQ/src/main/java/org/jooq/Meta.java b/jOOQ/src/main/java/org/jooq/Meta.java
index 146095a7a2..fa1302c2f9 100644
--- a/jOOQ/src/main/java/org/jooq/Meta.java
+++ b/jOOQ/src/main/java/org/jooq/Meta.java
@@ -68,6 +68,8 @@ public interface Meta {
      * For those databases that don't really support JDBC meta data catalogs, a
      * single empty catalog (named <code>""</code>) will be returned. In other
      * words, there is always at least one catalog in a database.
+     * <p>
+     * NOTE: Catalogs are experimental in jOOQ 3.0
      *
      * @throws DataAccessException If something went wrong fetching the meta
      *             objects