diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/package-info.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/io/package-info.java
new file mode 100644
index 000000000..d903211ba
--- /dev/null
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/io/package-info.java
@@ -0,0 +1,6 @@
+
+/**
+ * All classes relating directly to data input or output.
+ */
+package net.sourceforge.guacamole.io;
+
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/net/package-info.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/net/package-info.java
new file mode 100644
index 000000000..97ddc99d2
--- /dev/null
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/net/package-info.java
@@ -0,0 +1,7 @@
+
+/**
+ * Classes which apply to network-specific concepts, such as low-level sockets
+ * and tunnels.
+ */
+package net.sourceforge.guacamole.net;
+
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/package-info.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/package-info.java
new file mode 100644
index 000000000..2d895938d
--- /dev/null
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/package-info.java
@@ -0,0 +1,8 @@
+
+/**
+ * All classes which apply generally across the Guacamole web application
+ * and all other web applications which use the API provided by the
+ * Guacamole project.
+ */
+package net.sourceforge.guacamole;
+
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/properties/package-info.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/properties/package-info.java
new file mode 100644
index 000000000..1c01c62c4
--- /dev/null
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/properties/package-info.java
@@ -0,0 +1,7 @@
+
+/**
+ * Provides classes for reading properties from the web-application-wide
+ * guacamole.properties file.
+ */
+package net.sourceforge.guacamole.properties;
+
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/package-info.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/package-info.java
new file mode 100644
index 000000000..fc1e627e9
--- /dev/null
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/package-info.java
@@ -0,0 +1,6 @@
+
+/**
+ * Classes relating directly to the Guacamole protocol.
+ */
+package net.sourceforge.guacamole.protocol;
+
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/package-info.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/package-info.java
new file mode 100644
index 000000000..979a04dd5
--- /dev/null
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/package-info.java
@@ -0,0 +1,7 @@
+
+/**
+ * Classes which build upon the Java Servlet API, providing an HTTP-based
+ * tunnel and session management.
+ */
+package net.sourceforge.guacamole.servlet;
+