diff --git a/ChangeLog b/ChangeLog
index 43e6e68a1..c26622254 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-15  Duncan Mak  <duncan@ximian.com>
+
+	* gtk/TextBuffer.custom: Fix the Text property. Patch from Mathias
+	Hasselmann <mathias.hasselmann@gmx.de>.
+
 2003-03-15  Miguel de Icaza  <miguel@ximian.com>
 
 	* sample: Update samples to new Glade.Widget.
diff --git a/gtk/TextBuffer.custom b/gtk/TextBuffer.custom
index ce1072af7..bcca35058 100644
--- a/gtk/TextBuffer.custom
+++ b/gtk/TextBuffer.custom
@@ -4,7 +4,8 @@ public string Text {
 	}
 
 	set {
-		gtk_text_buffer_set_text (Handle, value, value.Length);
+		gtk_text_buffer_set_text (Handle, value, 
+				System.Text.Encoding.Default.GetByteCount(value));
 	}
 }