diff --git a/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java b/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
index 814b5c88..2d590fe0 100644
--- a/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
@@ -32,6 +32,8 @@ import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.server.ServerLoadProbe;
 
 /**
+ * FactoryBean for easy creation and configuration of GemFire {@link CacheServer} instances.
+ * 
  * @author Costin Leau
  */
 public class CacheServerFactoryBean implements FactoryBean<CacheServer>,
diff --git a/src/main/java/org/springframework/data/gemfire/server/package-info.java b/src/main/java/org/springframework/data/gemfire/server/package-info.java
new file mode 100644
index 00000000..457f4f8a
--- /dev/null
+++ b/src/main/java/org/springframework/data/gemfire/server/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support package for GemFire {@link com.gemstone.gemfire.cache.server.CacheServer}.
+ *
+ */
+package org.springframework.data.gemfire.server;
\ No newline at end of file