diff --git a/src/main/java/org/springframework/data/jpa/domain/package-info.java b/src/main/java/org/springframework/data/jpa/domain/package-info.java
new file mode 100644
index 000000000..996a45bc8
--- /dev/null
+++ b/src/main/java/org/springframework/data/jpa/domain/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * JPA specific support classes to implement domain classes. 
+ */
+package org.springframework.data.jpa.domain;
+
diff --git a/src/main/java/org/springframework/data/jpa/domain/support/package-info.java b/src/main/java/org/springframework/data/jpa/domain/support/package-info.java
new file mode 100644
index 000000000..4135d713c
--- /dev/null
+++ b/src/main/java/org/springframework/data/jpa/domain/support/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Implementation classes for auditing with JPA.
+ */
+package org.springframework.data.jpa.domain.support;
+
diff --git a/src/main/java/org/springframework/data/jpa/repository/config/package-info.java b/src/main/java/org/springframework/data/jpa/repository/config/package-info.java
index e77a53c69..9af11c562 100644
--- a/src/main/java/org/springframework/data/jpa/repository/config/package-info.java
+++ b/src/main/java/org/springframework/data/jpa/repository/config/package-info.java
@@ -1,4 +1,5 @@
 /**
- * Support classes for Spring namespace configuration.
+ * Classes for JPA namespace configuration.
  */
 package org.springframework.data.jpa.repository.config;
+
diff --git a/src/main/java/org/springframework/data/jpa/repository/package-info.java b/src/main/java/org/springframework/data/jpa/repository/package-info.java
new file mode 100644
index 000000000..814dc765a
--- /dev/null
+++ b/src/main/java/org/springframework/data/jpa/repository/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Interfaces and annotations for JPA specific repositories.
+ */
+package org.springframework.data.jpa.repository;
+
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/package-info.java b/src/main/java/org/springframework/data/jpa/repository/query/package-info.java
new file mode 100644
index 000000000..5d82778a6
--- /dev/null
+++ b/src/main/java/org/springframework/data/jpa/repository/query/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Query implementation to exectue queries against JPA.
+ */
+package org.springframework.data.jpa.repository.query;
+
diff --git a/src/main/java/org/springframework/data/jpa/repository/support/package-info.java b/src/main/java/org/springframework/data/jpa/repository/support/package-info.java
new file mode 100644
index 000000000..4dab22453
--- /dev/null
+++ b/src/main/java/org/springframework/data/jpa/repository/support/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * JPA repository implementations.
+ */
+package org.springframework.data.jpa.repository.support;
+
diff --git a/src/main/java/org/springframework/data/jpa/repository/utils/package-info.java b/src/main/java/org/springframework/data/jpa/repository/utils/package-info.java
new file mode 100644
index 000000000..5c6ce2b36
--- /dev/null
+++ b/src/main/java/org/springframework/data/jpa/repository/utils/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * JPA specific utitlity functions.
+ */
+package org.springframework.data.jpa.repository.utils;
+