diff --git a/ChangeLog b/ChangeLog
index 2b6b2e52a..4e622a089 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-05  Behdad Esfahbod  <behdad@gnome.org>
+
+	* glib/gutf8.c: Add not to g_utf8_get_char_validated() about
+	nul-terminated strings.
+
 2007-06-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gutils.c (g_get_user_special_dir): Don't deadlock
diff --git a/glib/gutf8.c b/glib/gutf8.c
index 150980d1f..7ff31a108 100644
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -755,7 +755,8 @@ g_utf8_get_char_extended (const  gchar *p,
 /**
  * g_utf8_get_char_validated:
  * @p: a pointer to Unicode character encoded as UTF-8
- * @max_len: the maximum number of bytes to read, or -1, for no maximum.
+ * @max_len: the maximum number of bytes to read, or -1, for no maximum or
+ *           if @p is nul-terminated
  * 
  * Convert a sequence of bytes encoded as UTF-8 to a Unicode character.
  * This function checks for incomplete characters, for invalid characters