diff --git a/jOOQ/src/main/java/org/jooq/DeleteResultStep.java b/jOOQ/src/main/java/org/jooq/DeleteResultStep.java
index 6d724fd85a..bde833cdfd 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteResultStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteResultStep.java
@@ -40,6 +40,7 @@
  */
 package org.jooq;
 
+// ...
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.POSTGRES;
 
@@ -60,6 +61,8 @@ import org.jooq.exception.DataAccessException;
  * <ul>
  * <li>Firebird and Postgres have native support for
  * <code>UPDATE .. RETURNING</code> clauses</li>
+ * <li>DB2 allows to execute
+ * <code>SELECT .. FROM FINAL TABLE (DELETE ...)</code></li>
  * </ul>
  *
  * @author Lukas Eder
@@ -69,16 +72,14 @@ public interface DeleteResultStep<R extends Record> extends Delete<R> {
     /**
      * The result holding returned values as specified by the
      * {@link UpdateReturningStep}
-     * <p>
-     * This currently only works well for DB2, HSQLDB, MySQL, and Postgres
      *
      * @return The returned values as specified by the
      *         {@link UpdateReturningStep}. Note:
      *         <ul>
      *         <li>Not all databases / JDBC drivers support returning several
-     *         values on multi-row inserts!</li><li>This may return an empty
-     *         <code>Result</code> in case jOOQ could not retrieve any generated
-     *         keys from the JDBC driver.</li>
+     *         values on multi-row inserts!</li>
+     *         <li>This may return an empty <code>Result</code> in case jOOQ
+     *         could not retrieve any generated keys from the JDBC driver.</li>
      *         </ul>
      * @throws DataAccessException if something went wrong executing the query
      * @see UpdateQuery#getReturnedRecords()
diff --git a/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java b/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java
index f25be4bed6..937dc88eb7 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java
@@ -61,6 +61,8 @@ import java.util.Collection;
  * <ul>
  * <li>Firebird and Postgres have native support for
  * <code>UPDATE .. RETURNING</code> clauses</li>
+ * <li>DB2 allows to execute
+ * <code>SELECT .. FROM FINAL TABLE (DELETE ...)</code></li>
  * </ul>
  *
  * @author Lukas Eder
diff --git a/jOOQ/src/main/java/org/jooq/InsertResultStep.java b/jOOQ/src/main/java/org/jooq/InsertResultStep.java
index 0b3c15e276..b442084d73 100644
--- a/jOOQ/src/main/java/org/jooq/InsertResultStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertResultStep.java
@@ -57,10 +57,10 @@ import org.jooq.exception.DataAccessException;
  * <p>
  * This implemented differently for every dialect:
  * <ul>
- * <li>Firebird and Postgres have native support for
- * <code>INSERT .. RETURNING</code> clauses</li>
- * <li>HSQLDB, Oracle, and DB2 JDBC drivers allow for retrieving any table
- * column as "generated key" in one statement</li>
+ * <li>DB2 allows to execute
+ * <code>SELECT .. FROM FINAL TABLE (INSERT ...)</code></li>
+ * <li>HSQLDB, and Oracle JDBC drivers allow for retrieving any table column as
+ * "generated key" in one statement</li>
  * <li>Derby, H2, Ingres, MySQL, SQL Server only allow for retrieving IDENTITY
  * column values as "generated key". If other fields are requested, a second
  * statement is issued. Client code must assure transactional integrity between
@@ -79,8 +79,6 @@ public interface InsertResultStep<R extends Record> extends Insert<R> {
     /**
      * The result holding returned values as specified by the
      * {@link InsertReturningStep}
-     * <p>
-     * This currently only works well for DB2, HSQLDB, MySQL, and Postgres
      *
      * @return The returned values as specified by the
      *         {@link InsertReturningStep}. Note:
diff --git a/jOOQ/src/main/java/org/jooq/InsertReturningStep.java b/jOOQ/src/main/java/org/jooq/InsertReturningStep.java
index 26cdefc9da..4bad669736 100644
--- a/jOOQ/src/main/java/org/jooq/InsertReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertReturningStep.java
@@ -59,8 +59,10 @@ import java.util.Collection;
  * <ul>
  * <li>Firebird and Postgres have native support for
  * <code>INSERT .. RETURNING</code> clauses</li>
- * <li>HSQLDB, Oracle, and DB2 JDBC drivers allow for retrieving any table
- * column as "generated key" in one statement</li>
+ * <li>DB2 allows to execute
+ * <code>SELECT .. FROM FINAL TABLE (INSERT ...)</code></li>
+ * <li>HSQLDB, and Oracle JDBC drivers allow for retrieving any table column as
+ * "generated key" in one statement</li>
  * <li>Derby, H2, Ingres, MySQL, SQL Server only allow for retrieving IDENTITY
  * column values as "generated key". If other fields are requested, a second
  * statement is issued. Client code must assure transactional integrity between
diff --git a/jOOQ/src/main/java/org/jooq/UpdateResultStep.java b/jOOQ/src/main/java/org/jooq/UpdateResultStep.java
index f3383e7de7..876034fadc 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateResultStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateResultStep.java
@@ -40,6 +40,7 @@
  */
 package org.jooq;
 
+// ...
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.POSTGRES;
 
@@ -63,6 +64,8 @@ import org.jooq.exception.DataAccessException;
  * <ul>
  * <li>Firebird and Postgres have native support for
  * <code>UPDATE .. RETURNING</code> clauses</li>
+ * <li>DB2 allows to execute
+ * <code>SELECT .. FROM FINAL TABLE (UPDATE ...)</code></li>
  * </ul>
  *
  * @author Lukas Eder
@@ -72,8 +75,6 @@ public interface UpdateResultStep<R extends Record> extends Update<R> {
     /**
      * The result holding returned values as specified by the
      * {@link UpdateReturningStep}
-     * <p>
-     * This currently only works well for DB2, HSQLDB, MySQL, and Postgres
      *
      * @return The returned values as specified by the
      *         {@link UpdateReturningStep}. Note:
diff --git a/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java b/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java
index 4ac3c98842..0764115fd9 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java
@@ -64,6 +64,8 @@ import java.util.Collection;
  * <ul>
  * <li>Firebird and Postgres have native support for
  * <code>UPDATE .. RETURNING</code> clauses</li>
+ * <li>DB2 allows to execute
+ * <code>SELECT .. FROM FINAL TABLE (UPDATE ...)</code></li>
  * </ul>
  *
  * @author Lukas Eder