diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/annotation/package-info.java b/org.springframework.context.support/src/main/java/org/springframework/cache/annotation/package-info.java
new file mode 100644
index 00000000000..f61fb1e579e
--- /dev/null
+++ b/org.springframework.context.support/src/main/java/org/springframework/cache/annotation/package-info.java
@@ -0,0 +1,10 @@
+
+/**
+ *
+ * JDK 1.5+ annotation for caching demarcation.
+ * Hooked into Spring's caching interception infrastructure
+ * via CacheDefinitionSource implementation.
+ *
+ */
+package org.springframework.cache.annotation;
+
diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/concurrent/package-info.java b/org.springframework.context.support/src/main/java/org/springframework/cache/concurrent/package-info.java
new file mode 100644
index 00000000000..4965e8534d0
--- /dev/null
+++ b/org.springframework.context.support/src/main/java/org/springframework/cache/concurrent/package-info.java
@@ -0,0 +1,10 @@
+
+/**
+ *
+ * Implementation package for java.util.concurrent based
+ * caches. Provides a CacheManager and Cache implementation
+ * for usage in a Spring context.
+ *
+ */
+package org.springframework.cache.concurrent;
+
diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/config/package-info.java b/org.springframework.context.support/src/main/java/org/springframework/cache/config/package-info.java
new file mode 100644
index 00000000000..e601fd4b73c
--- /dev/null
+++ b/org.springframework.context.support/src/main/java/org/springframework/cache/config/package-info.java
@@ -0,0 +1,9 @@
+
+/**
+ *
+ * Support package for declarative caching configuration,
+ * with XML schema being the primary configuration format.
+ *
+ */
+package org.springframework.cache.config;
+
diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/package-info.java b/org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/package-info.java
index d51636fa4f1..101caa7de72 100644
--- a/org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/package-info.java
+++ b/org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/package-info.java
@@ -2,7 +2,7 @@
/**
*
* Support classes for the open source cache
- * EHCache,
+ * Ehcache,
* allowing to set up an EHCache CacheManager and Caches
* as beans in a Spring context.
*
diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/package-info.java b/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/package-info.java
new file mode 100644
index 00000000000..1b229991d34
--- /dev/null
+++ b/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * AOP-based solution for declarative caching demarcation.
+ * Builds on the AOP infrastructure in org.springframework.aop.framework.
+ * Any POJO can be cache advised with Spring.
+ *
+ */
+package org.springframework.cache.interceptor;
+
diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/package-info.java b/org.springframework.context.support/src/main/java/org/springframework/cache/package-info.java
new file mode 100644
index 00000000000..79767826c0f
--- /dev/null
+++ b/org.springframework.context.support/src/main/java/org/springframework/cache/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * Spring's generic cache abstraction.
+ * Concrete implementations are provided in the subpackages.
+ *
+ */
+package org.springframework.cache;
+
diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/support/package-info.java b/org.springframework.context.support/src/main/java/org/springframework/cache/support/package-info.java
new file mode 100644
index 00000000000..852503e8f9f
--- /dev/null
+++ b/org.springframework.context.support/src/main/java/org/springframework/cache/support/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * Support classes for the the org.springframework.cache package.
+ * Provides abstract classes for cache managers and caches.
+ */
+package org.springframework.cache.support;
+