diff --git a/ChangeLog b/ChangeLog
index ed88ab793d..cc01bbe78d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-19  Christian Persch  <chpe@gnome.org>
+ 
+ 	Bug 552837 – mem leak in gtkimmulticontext
+ 
+ 	* gtk/gtkimmulticontext.c: (gtk_im_multicontext_get_slave): Plug mem
+ 	leak.
+ 
 2008-09-18  Emmanuele Bassi  <ebassi@linux.intel.com>
 
 	* gtk/gtkfilechooserdefault.c (settings_save): Save the size column
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index 3b73cc40fd..f33a6cc750 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -237,6 +237,7 @@ gtk_im_multicontext_get_slave (GtkIMMulticontext *multicontext)
       gtk_im_multicontext_set_slave (multicontext, slave, FALSE);
       g_object_unref (slave);
 
+      g_free (multicontext->context_id);
       multicontext->context_id = g_strdup (global_context_id);
     }