diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/package-info.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/package-info.java
new file mode 100644
index 000000000..720909133
--- /dev/null
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Infrastructure for Spring Data's MongoDB cross store support.
+ */
+package org.springframework.data.mongodb.crossstore;
+
diff --git a/spring-data-mongodb-log4j/src/main/java/org/springframework/data/mongodb/log4j/package-info.java b/spring-data-mongodb-log4j/src/main/java/org/springframework/data/mongodb/log4j/package-info.java
new file mode 100644
index 000000000..06a59f17f
--- /dev/null
+++ b/spring-data-mongodb-log4j/src/main/java/org/springframework/data/mongodb/log4j/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Infrastructure for to use MongoDB as a logging sink.
+ */
+package org.springframework.data.mongodb.log4j;
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/package-info.java
new file mode 100644
index 000000000..89a163a21
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Spring Data MongoDB specific converter infrastructure.
+ */
+package org.springframework.data.mongodb.core.convert;
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/package-info.java
new file mode 100644
index 000000000..792e68068
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support for MongoDB geo-spatial queries.
+ */
+package org.springframework.data.mongodb.core.geo;
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/package-info.java
new file mode 100644
index 000000000..4f82c9782
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support for MongoDB document indexing.
+ */
+package org.springframework.data.mongodb.core.index;
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/package-info.java
new file mode 100644
index 000000000..96c601da3
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Mapping event callback infrastructure for the MongoDB document-to-object mapping subsystem.
+ */
+package org.springframework.data.mongodb.core.mapping.event;
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/package-info.java
new file mode 100644
index 000000000..5e451b043
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Infrastructure for the MongoDB document-to-object mapping subsystem.
+ */
+package org.springframework.data.mongodb.core.mapping;
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/package-info.java
new file mode 100644
index 000000000..ca447893d
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support for MongoDB map-reduce operations.
+ */
+package org.springframework.data.mongodb.core.mapreduce;
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/package-info.java
new file mode 100644
index 000000000..b76640542
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support for MongoDB GridFS feature.
+ */
+package org.springframework.data.mongodb.gridfs;
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/package-info.java
new file mode 100644
index 000000000..1a6fe3950
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Spring Data's MongoDB abstraction.
+ */
+package org.springframework.data.mongodb;
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/package-info.java
new file mode 100644
index 000000000..ca8bb77ac
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * CDI support for MongoDB specific repository implementation.
+ */
+package org.springframework.data.mongodb.repository.cdi;
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/package-info.java
new file mode 100644
index 000000000..30e2aeb82
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support infrastructure for the configuration of MongoDB specific repositories.
+ */
+package org.springframework.data.mongodb.repository.config;
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/package-info.java
new file mode 100644
index 000000000..f31ea0222
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Query derivation mechanism for MongoDB specific repositories.
+ */
+package org.springframework.data.mongodb.repository.query;
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/package-info.java
new file mode 100644
index 000000000..9520a0833
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support infrastructure for query derivation of MongoDB specific repositories.
+ */
+package org.springframework.data.mongodb.repository.support;
+