diff --git a/ChangeLog b/ChangeLog
index ad60c5010..c7e97139d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-23  Thiago Milczarek Sayão  <sayao@brturbo.com>
+
+	* gtk/TextBuffer.custom : add TextIter parm to InsertWithTags method.
+
 2004-02-21  Mike Kestner  <mkestner@ximian.com>
 
 	* pango/Pango.metadata : mark some out params on Layout.
diff --git a/gtk/TextBuffer.custom b/gtk/TextBuffer.custom
index 98835d770..f9012edee 100644
--- a/gtk/TextBuffer.custom
+++ b/gtk/TextBuffer.custom
@@ -22,16 +22,16 @@ public void PasteClipboard (Gtk.Clipboard clipboard)
 	gtk_text_buffer_paste_clipboard(Handle, clipboard.Handle, IntPtr.Zero, true);
 }
 
-public void InsertWithTags (string text, params TextTag[] tags)
+public void InsertWithTags (TextIter iter, string text, params TextTag[] tags)
 {
-	TextIter iter;
-	
-	this.Insert (EndIter, text);
-	iter = this.GetIterAtOffset (EndIter.Offset - text.Length);
+	TextIter start;
+	int offset = iter.Offset;
+	Insert (iter, text);
+
+	start = GetIterAtOffset (offset);
+	iter = GetIterAtOffset (offset + text.Length);
 
 	foreach (TextTag t in tags)
-	{
-		this.ApplyTag (t, iter, EndIter);
-	}
+		this.ApplyTag (t, start, iter);
 }