diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
index fef8250845..eb9df0d254 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
@@ -207,7 +207,12 @@ public class DefaultGenerator extends AbstractGenerator {
 
             outF = new GenerationWriter(strategy.getFile(schema, Mode.FACTORY));
             printHeader(outF, schema);
-            printClassJavadoc(outF, schema);
+            printClassJavadoc(outF,
+                "A Factory for specific use with the <code>" + schema.getOutputName() +
+                "</code> schema.<p>This Factory will not render the <code>" + schema.getOutputName() +
+                "</code> schema's schema name in rendered SQL (assuming that you use it as the default schema on your connection!). Use the more generic {@link " +
+                database.getDialect().getFactory().getName() +
+                "} or the {@link " + Factory.class.getName() + "} instead, if you want to fully qualify tables, routines, etc.");
 
             outF.print("public class ");
             outF.print(strategy.getJavaClassName(schema, Mode.FACTORY));
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/PublicFactory.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/PublicFactory.java
index e06bdcfc9c..a9fd84b730 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/PublicFactory.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/PublicFactory.java
@@ -5,10 +5,12 @@ package org.jooq.test.h2.generatedclasses;
 
 /**
  * This class is generated by jOOQ.
+ *
+ * A Factory for specific use with the <code>PUBLIC</code> schema.<p>This Factory will not render the <code>PUBLIC</code> schema's schema name in rendered SQL (assuming that you use it as the default schema on your connection!). Use the more generic {@link org.jooq.util.h2.H2Factory} or the {@link org.jooq.impl.Factory} instead, if you want to fully qualify tables, routines, etc.
  */
 public class PublicFactory extends org.jooq.util.h2.H2Factory {
 
-	private static final long serialVersionUID = -1105638453;
+	private static final long serialVersionUID = -904520167;
 
 	/**
 	 * Create a factory with a connection