diff --git a/ChangeLog b/ChangeLog
index 970ece4344..b4fe7b95c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_class_init): Expand the documentation
+	for GtkLabel::ellipsize.
+
 Mon Jul 26 00:38:27 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Make the GtkComboBox in list mode scroll if the list is too
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 970ece4344..b4fe7b95c4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-07-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_class_init): Expand the documentation
+	for GtkLabel::ellipsize.
+
 Mon Jul 26 00:38:27 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Make the GtkComboBox in list mode scroll if the list is too
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 970ece4344..b4fe7b95c4 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-07-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_class_init): Expand the documentation
+	for GtkLabel::ellipsize.
+
 Mon Jul 26 00:38:27 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Make the GtkComboBox in list mode scroll if the list is too
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 970ece4344..b4fe7b95c4 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-07-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_class_init): Expand the documentation
+	for GtkLabel::ellipsize.
+
 Mon Jul 26 00:38:27 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Make the GtkComboBox in list mode scroll if the list is too
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index f76821cf1e..ae8ef1e4aa 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -385,6 +385,21 @@ gtk_label_class_init (GtkLabelClass *class)
                                                      0,
                                                      G_PARAM_READABLE));
   
+  /**
+   * GtkLabel:ellipsize:
+   *
+   * The preferred place to ellipsize the string, if the label does not have 
+   * enough room to display the entire string, specified as a #PangoEllisizeMode. 
+   *
+   * Note that setting this property to a value other than %PANGO_ELLIPSIZE_NONE 
+   * has the side-effect that the label requests only enough space to display the
+   * ellipsis "...". Ellipsizing labels must be packed in a container which 
+   * ensures that the label gets a reasonable size allocated. In particular, 
+   * this means that ellipsizing labels don't work well in notebook tabs, unless
+   * the tab's ::tab-expand property is set to %TRUE.
+   *
+   * Since: 2.6
+   */
   g_object_class_install_property (gobject_class,
 				   PROP_ELLIPSIZE,
                                    g_param_spec_enum ("ellipsize",