diff --git a/ChangeLog b/ChangeLog
index c1727be98e..4ed9b5c148 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-04  Johan Dahlin  <johan@gnome.org>
+
+	* gtk/gtktextbuffer.c: (gtk_text_buffer_class_init),
+	(gtk_text_buffer_set_property), (gtk_text_buffer_get_property),
+	(gtk_text_buffer_set_text): Add GtkTextBuffer::text (#172631)
+
 Mon Apr  4 14:33:55 2005  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_get_active_text):
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c1727be98e..4ed9b5c148 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-04-04  Johan Dahlin  <johan@gnome.org>
+
+	* gtk/gtktextbuffer.c: (gtk_text_buffer_class_init),
+	(gtk_text_buffer_set_property), (gtk_text_buffer_get_property),
+	(gtk_text_buffer_set_text): Add GtkTextBuffer::text (#172631)
+
 Mon Apr  4 14:33:55 2005  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_get_active_text):
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c1727be98e..4ed9b5c148 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-04-04  Johan Dahlin  <johan@gnome.org>
+
+	* gtk/gtktextbuffer.c: (gtk_text_buffer_class_init),
+	(gtk_text_buffer_set_property), (gtk_text_buffer_get_property),
+	(gtk_text_buffer_set_text): Add GtkTextBuffer::text (#172631)
+
 Mon Apr  4 14:33:55 2005  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_get_active_text):
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 1bb9ec9fa6..3a18a739fc 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -72,7 +72,10 @@ enum {
   PROP_0,
 
   /* Construct */
-  PROP_TAG_TABLE
+  PROP_TAG_TABLE,
+  
+  /* Normal */
+  PROP_TEXT
 };
 
 enum {
@@ -187,6 +190,24 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                                                         GTK_TYPE_TEXT_TAG_TABLE,
                                                         GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
+  /* Normal properties*/
+  
+  /**
+   * GtkTextBuffer:text:
+   *
+   * The text content of the buffer. Without child widgets and images,
+   * see gtk_text_buffer_get_text () for more information.
+   *
+   * Since: 2.8
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_TEXT,
+                                   g_param_spec_string ("text",
+                                                        P_("Text"),
+                                                        P_("Current text of the buffer"),
+							"",
+                                                        GTK_PARAM_READWRITE));
+
   signals[INSERT_TEXT] =
     g_signal_new ("insert_text",
                   G_OBJECT_CLASS_TYPE (object_class),
@@ -386,6 +407,11 @@ gtk_text_buffer_set_property (GObject         *object,
     case PROP_TAG_TABLE:
       set_table (text_buffer, g_value_get_object (value));
       break;
+      
+    case PROP_TEXT:
+      gtk_text_buffer_set_text (text_buffer, 
+				g_value_get_string (value), -1);
+      break;
 
     default:
       break;
@@ -407,6 +433,18 @@ gtk_text_buffer_get_property (GObject         *object,
     case PROP_TAG_TABLE:
       g_value_set_object (value, get_table (text_buffer));
       break;
+      
+    case PROP_TEXT:
+    {
+      GtkTextIter start, end;
+      
+      gtk_text_buffer_get_start_iter (text_buffer, &start);
+      gtk_text_buffer_get_end_iter (text_buffer, &end);
+	    
+      g_value_set_string (value,
+			  gtk_text_buffer_get_text (text_buffer, &start, &end, FALSE));
+      break;
+    }
 
     default:
       break;
@@ -524,8 +562,12 @@ gtk_text_buffer_set_text (GtkTextBuffer *buffer,
       gtk_text_buffer_get_iter_at_offset (buffer, &start, 0);
       gtk_text_buffer_insert (buffer, &start, text, len);
     }
+  
+  g_object_notify (G_OBJECT (buffer), "text");
 }
 
+ 
+
 /*
  * Insertion
  */