diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/package-info.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/package-info.java
index 67d0425518..d3ca966ca9 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/package-info.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/package-info.java
@@ -1,5 +1,19 @@
 /**
- * This package contains compatibility classes to bridge between JDBC 4.0 and
- * JDBC 4.1.
+ * JDBC tooling.
+ * <p>
+ * This package contains
+ * <ul>
+ * <li>Compatibility classes to bridge between JDBC 4.0, 4.1, 4.2, 4.3 (see
+ * {@link org.jooq.tools.jdbc.JDBC41Connection})</li>
+ * <li>The {@link org.jooq.tools.jdbc.BatchedConnection} that allows for
+ * batching statements transparently on a JDBC level</li>
+ * <li>A {@link org.jooq.tools.jdbc.DefaultConnection} that implements all the
+ * API and delegates to another connection, useful as base class for other
+ * utilities</li>
+ * <li>A {@link org.jooq.tools.jdbc.MockConnection}, which mocks the JDBC API
+ * based on fixed data</li>
+ * <li>A {@link org.jooq.tools.jdbc.LoggingConnection}, which logs all
+ * statements that are executed by it</li>
+ * </ul>
  */
 package org.jooq.tools.jdbc;
diff --git a/jOOQ/src/main/java/org/jooq/tools/r2dbc/package-info.java b/jOOQ/src/main/java/org/jooq/tools/r2dbc/package-info.java
new file mode 100644
index 0000000000..03b2b043f5
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/tools/r2dbc/package-info.java
@@ -0,0 +1,13 @@
+/**
+ * R2DBC tooling.
+ * <p>
+ * This package contains
+ * <ul>
+ * <li>A {@link org.jooq.tools.r2dbc.DefaultConnection} that implements all the
+ * API and delegates to another connection, useful as base class for other
+ * utilities</li>
+ * <li>A {@link org.jooq.tools.r2dbc.LoggingConnection}, which logs all
+ * statements that are executed by it</li>
+ * </ul>
+ */
+package org.jooq.tools.r2dbc;