diff --git a/ChangeLog b/ChangeLog
index 049999e630..dcedcba09a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-03  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkstyle.c (option_menu_get_props)
+	* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): Use 
+	gtk_border_free when freeing borders.
+
 2007-01-03  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkentry.c (get_text_area_size): Work when the
diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 69e10495c4..b1ccf8a2e4 100644
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -411,7 +411,7 @@ gtk_option_menu_get_props (GtkOptionMenu       *option_menu,
     props->indicator_spacing = default_props.indicator_spacing;
 
   g_free (indicator_size);
-  g_free (indicator_spacing);
+  gtk_border_free (indicator_spacing);
 }
 
 static void
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index ed35c6c07f..44b7d6eff7 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -3253,7 +3253,7 @@ option_menu_get_props (GtkWidget      *widget,
   if (tmp_spacing)
     {
       *indicator_spacing = *tmp_spacing;
-      g_free (tmp_spacing);
+      gtk_border_free (tmp_spacing);
     }
   else
     *indicator_spacing = default_option_indicator_spacing;