diff --git a/ChangeLog b/ChangeLog
index e0fcf5d0cd..739b637e0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-24  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 557524 – "va_end(args);" should be added into
+	gtk_text_buffer_insert_with_tags_by_name( )
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_insert_with_tags_by_name):
+	Don't forget to call va_end. Pointed out by Boram Park
+
 2008-10-23  Alexander Larsson  <alexl@redhat.com>
 
 	Bug 528320 - Incorrect icons displayed for files with custom mimetype icons
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 264839b7d1..080e5e0e14 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -1530,6 +1530,7 @@ gtk_text_buffer_insert_with_tags_by_name  (GtkTextBuffer *buffer,
       if (tag == NULL)
         {
           g_warning ("%s: no tag with name '%s'!", G_STRLOC, tag_name);
+          va_end (args);
           return;
         }