diff --git a/jOOQ/src/main/java/org/jooq/conf/package-info.java b/jOOQ/src/main/java/org/jooq/conf/package-info.java
new file mode 100644
index 0000000000..4080f0f380
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/conf/package-info.java
@@ -0,0 +1,9 @@
+/**
+ * The org.jooq.conf package contains jOOQ's runtime configuration
+ * classes
+ *
+ * This package contains JAXB-annotated configuration classes that can be
+ * provided to a {@link org.jooq.impl.Factory} in order to influence jOOQ's
+ * runtime behaviour.
+ */
+package org.jooq.conf;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/exception/package-info.java b/jOOQ/src/main/java/org/jooq/exception/package-info.java
new file mode 100644
index 0000000000..e0a69df7a4
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/exception/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * The org.jooq.exception package contains jOOQ's exceptions
+ */
+package org.jooq.exception;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/impl/package-info.java b/jOOQ/src/main/java/org/jooq/impl/package-info.java
new file mode 100644
index 0000000000..dacf885305
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/impl/package-info.java
@@ -0,0 +1,9 @@
+/**
+ * The org.jooq.impl package contains jOOQ's implementation classes
+ *
+ * This package provides implementations for the jOOQ API from
+ * org.jooq, whose interfaces are constructed mostly through the
+ * {@link org.jooq.impl.Factory} class, which hides implementation facts from
+ * the public API
+ */
+package org.jooq.impl;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/package-info.java b/jOOQ/src/main/java/org/jooq/package-info.java
new file mode 100644
index 0000000000..af13e596ee
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/package-info.java
@@ -0,0 +1,9 @@
+/**
+ * The org.jooq package contains jOOQ's public API
+ *
+ * This package mostly contains interfaces that are implemented by the
+ * org.jooq.impl package. These interfaces are constructed mostly
+ * through the {@link org.jooq.impl.Factory} class, which hides implementation
+ * facts from the public API
+ */
+package org.jooq;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/tools/csv/package-info.java b/jOOQ/src/main/java/org/jooq/tools/csv/package-info.java
new file mode 100644
index 0000000000..080ff9e7ed
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/tools/csv/package-info.java
@@ -0,0 +1,10 @@
+/**
+ * The org.jooq.tools.csv package contains parts of OpenCSV
+ *
+ * jOOQ has no external dependencies. Nevertheless, some libraries that are + * compatible with jOOQ's Apache License 2.0 are embedded into jOOQ. See the + * OpenCSV website for more details about OpenCSV: + *
+ * http://opencsv.sourceforge.net/
+ */
+package org.jooq.tools.csv;
\ No newline at end of file
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
new file mode 100644
index 0000000000..95a7ffeef9
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.tools.jdbc package contains compatibility classes
+ * to bridge between JDBC 4.0 and JDBC 4.1
+ */
+package org.jooq.tools.jdbc;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/tools/json/package-info.java b/jOOQ/src/main/java/org/jooq/tools/json/package-info.java
new file mode 100644
index 0000000000..684ac76dd3
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/tools/json/package-info.java
@@ -0,0 +1,10 @@
+/**
+ * The org.jooq.tools.json package contains parts of JSON Simple
+ *
+ * jOOQ has no external dependencies. Nevertheless, some libraries that are + * compatible with jOOQ's Apache License 2.0 are embedded into jOOQ. See the + * JSON Simple website for more details about JSON Simple: + *
+ * http://code.google.com/p/json-simple/
+ */
+package org.jooq.tools.json;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/tools/package-info.java b/jOOQ/src/main/java/org/jooq/tools/package-info.java
new file mode 100644
index 0000000000..c30043f266
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/tools/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * The org.jooq.tools package contains jOOQ's public utilities
+ */
+package org.jooq.tools;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/tools/reflect/package-info.java b/jOOQ/src/main/java/org/jooq/tools/reflect/package-info.java
new file mode 100644
index 0000000000..797698e1ba
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/tools/reflect/package-info.java
@@ -0,0 +1,10 @@
+/**
+ * The org.jooq.tools.reflect package contains parts of jOOR
+ *
+ * jOOQ has no external dependencies. Nevertheless, some libraries that are + * compatible with jOOQ's Apache License 2.0 are embedded into jOOQ. See the + * jOOR website for more details about jOOR: + *
+ * http://code.google.com/p/joor/
+ */
+package org.jooq.tools.reflect;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/tools/unsigned/package-info.java b/jOOQ/src/main/java/org/jooq/tools/unsigned/package-info.java
new file mode 100644
index 0000000000..3d1abcb9a8
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/tools/unsigned/package-info.java
@@ -0,0 +1,10 @@
+/**
+ * The org.jooq.tools.unsigned package contains parts of jOOU
+ *
+ * jOOQ has no external dependencies. Nevertheless, some libraries that are + * compatible with jOOQ's Apache License 2.0 are embedded into jOOQ. See the + * jOOU website for more details about jOOU: + *
+ * http://code.google.com/p/joou/
+ */
+package org.jooq.tools.unsigned;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/types/package-info.java b/jOOQ/src/main/java/org/jooq/types/package-info.java
new file mode 100644
index 0000000000..57c5441111
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/types/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * The org.jooq.tools.types package contains data types that are
+ * missing in JDBC
+ *
+ * JDBC is missing some important SQL data types, such as INTERVAL types, or
+ * UNSIGNED NUMBER types. These are provided here in this package by jOOQ
+ */
+package org.jooq.types;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/ase/package-info.java b/jOOQ/src/main/java/org/jooq/util/ase/package-info.java
new file mode 100644
index 0000000000..25d8c6bb26
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/ase/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#CUBRID} dialect
+ */
+package org.jooq.util.ase;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/cubrid/package-info.java b/jOOQ/src/main/java/org/jooq/util/cubrid/package-info.java
new file mode 100644
index 0000000000..76763abf65
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/cubrid/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#ASE} dialect
+ */
+package org.jooq.util.cubrid;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/db2/package-info.java b/jOOQ/src/main/java/org/jooq/util/db2/package-info.java
new file mode 100644
index 0000000000..77ad8016e2
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/db2/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#DB2} dialect
+ */
+package org.jooq.util.db2;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/derby/package-info.java b/jOOQ/src/main/java/org/jooq/util/derby/package-info.java
new file mode 100644
index 0000000000..1151b51407
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/derby/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#DERBY} dialect
+ */
+package org.jooq.util.derby;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/firebird/package-info.java b/jOOQ/src/main/java/org/jooq/util/firebird/package-info.java
new file mode 100644
index 0000000000..d8e9e2ad50
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/firebird/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#FIREBIRD} dialect
+ */
+package org.jooq.util.firebird;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/h2/package-info.java b/jOOQ/src/main/java/org/jooq/util/h2/package-info.java
new file mode 100644
index 0000000000..9a18ba80a1
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/h2/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#H2} dialect
+ */
+package org.jooq.util.h2;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/hsqldb/package-info.java b/jOOQ/src/main/java/org/jooq/util/hsqldb/package-info.java
new file mode 100644
index 0000000000..345fd001cd
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/hsqldb/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#HSQLDB} dialect
+ */
+package org.jooq.util.hsqldb;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/ingres/package-info.java b/jOOQ/src/main/java/org/jooq/util/ingres/package-info.java
new file mode 100644
index 0000000000..810a38a084
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/ingres/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#INGRES} dialect
+ */
+package org.jooq.util.ingres;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/mysql/package-info.java b/jOOQ/src/main/java/org/jooq/util/mysql/package-info.java
new file mode 100644
index 0000000000..4e58a246ef
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/mysql/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#ORACLE} dialect
+ */
+package org.jooq.util.mysql;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/oracle/package-info.java b/jOOQ/src/main/java/org/jooq/util/oracle/package-info.java
new file mode 100644
index 0000000000..9efa9acc2d
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/oracle/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#MYSQL} dialect
+ */
+package org.jooq.util.oracle;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/postgres/package-info.java b/jOOQ/src/main/java/org/jooq/util/postgres/package-info.java
new file mode 100644
index 0000000000..4d43602c62
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/postgres/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#POSTGRES} dialect
+ */
+package org.jooq.util.postgres;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/sqlite/package-info.java b/jOOQ/src/main/java/org/jooq/util/sqlite/package-info.java
new file mode 100644
index 0000000000..6b3b274a79
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/sqlite/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#SQLITE} dialect
+ */
+package org.jooq.util.sqlite;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/sqlserver/package-info.java b/jOOQ/src/main/java/org/jooq/util/sqlserver/package-info.java
new file mode 100644
index 0000000000..ae2298599e
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/sqlserver/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#SQLSERVER} dialect
+ */
+package org.jooq.util.sqlserver;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/util/sybase/package-info.java b/jOOQ/src/main/java/org/jooq/util/sybase/package-info.java
new file mode 100644
index 0000000000..94721d782f
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/util/sybase/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * The org.jooq.util.ase package contains classes related to the
+ * {@link org.jooq.SQLDialect#SYBASE} dialect
+ */
+package org.jooq.util.sybase;
\ No newline at end of file