diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleClientInformation.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleClientInformation.java
index 65d7ad7eb..524eac8f4 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleClientInformation.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleClientInformation.java
@@ -167,7 +167,9 @@ public class GuacamoleClientInformation {
      * database format.
      * 
      * @param timezone
-     *     The string value of the timezone reported by the client.
+     *     The string value of the timezone reported by the client, in tz
+     *     database format, or null if the timezone is not provided by the
+     *     client.
      */
     public void setTimezone(String timezone) {
         this.timezone = timezone;