diff --git a/jOOQ/src/main/java/org/jooq/Configuration.java b/jOOQ/src/main/java/org/jooq/Configuration.java
index 6fd24ea2c7..63a6326c01 100644
--- a/jOOQ/src/main/java/org/jooq/Configuration.java
+++ b/jOOQ/src/main/java/org/jooq/Configuration.java
@@ -302,7 +302,10 @@ public interface Configuration extends Serializable {
     /**
      * Get the configured <code>ConverterProvider</code> from this
      * configuration.
+     *
+     * @deprecated - This API is still EXPERIMENTAL. Do not use yet
      */
+    @Deprecated
     ConverterProvider converterProvider();
 
     /**
@@ -439,7 +442,9 @@ public interface Configuration extends Serializable {
      * @param newConverterProvider The new converter provider to be contained in
      *            the changed configuration.
      * @return The changed configuration.
+     * @deprecated - This API is still EXPERIMENTAL. Do not use yet
      */
+    @Deprecated
     Configuration set(ConverterProvider newConverterProvider);
 
     /**
@@ -562,10 +567,12 @@ public interface Configuration extends Serializable {
      * Create a derived configuration from this one, with new converter
      * provider.
      *
-     * @param newConverterProvider The new converter provider to
-     *            be contained in the derived configuration.
+     * @param newConverterProvider The new converter provider to be contained in
+     *            the derived configuration.
      * @return The derived configuration.
+     * @deprecated - This API is still EXPERIMENTAL. Do not use yet
      */
+    @Deprecated
     Configuration derive(ConverterProvider newConverterProvider);
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/ConverterProvider.java b/jOOQ/src/main/java/org/jooq/ConverterProvider.java
index 6db1aada1e..58af7251f3 100644
--- a/jOOQ/src/main/java/org/jooq/ConverterProvider.java
+++ b/jOOQ/src/main/java/org/jooq/ConverterProvider.java
@@ -45,7 +45,9 @@ package org.jooq;
  * for any combination of types <code>&lt;T></code> and <code>&lt;U></code>.
  *
  * @author Lukas Eder
+ * @deprecated - This API is still EXPERIMENTAL. Do not use yet
  */
+@Deprecated
 public interface ConverterProvider {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultConverterProvider.java b/jOOQ/src/main/java/org/jooq/impl/DefaultConverterProvider.java
index 4285e60853..dccae00cd8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultConverterProvider.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultConverterProvider.java
@@ -60,7 +60,9 @@ import org.jooq.Converters;
 
 /**
  * @author Lukas Eder
+ * @deprecated - This API is still EXPERIMENTAL. Do not use yet
  */
+@Deprecated
 public class DefaultConverterProvider implements ConverterProvider {
 
     final Graph graph = new Graph();