diff --git a/ChangeLog b/ChangeLog
index 9f337fdb9..19fdc2966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-05  Chris Lord  <chris@openedhand.com>
+
+	* clutter/clutter-entry.c:
+	Correct the documentation for clutter_entry_set_max_length, fixes bug
+	#915.
+
 2008-06-04  Robert Bragg  <bob@o-hand.com>
 
 	* tests/test-clip.c:
diff --git a/clutter/clutter-entry.c b/clutter/clutter-entry.c
index 1a79da348..6ec189fda 100644
--- a/clutter/clutter-entry.c
+++ b/clutter/clutter-entry.c
@@ -1706,8 +1706,8 @@ clutter_entry_get_invisible_char (ClutterEntry *entry)
 /**
  * clutter_entry_set_max_length:
  * @entry: a #ClutterEntry
- * @max: the maximum number of characters allowed in the entry, or -1
- *   to disable
+ * @max: the maximum number of characters allowed in the entry; 0
+ *   to disable or -1 to set the length of the current string
  *
  * Sets the maximum allowed length of the contents of the actor. If the
  * current contents are longer than the given length, then they will be