diff --git a/ChangeLog b/ChangeLog
index 17388abee1..0cf939f0d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-24  Behdad Esfahbod  <behdad@gnome.org>
+
+	* gtk/gtkentry.c (_gtk_entry_effective_inner_border):
+	Use gtk_border_free when freeing border.
+
 2006-12-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_button_press): When
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index c5ade49565..49bcb3b9bf 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1447,7 +1447,7 @@ _gtk_entry_effective_inner_border (GtkEntry  *entry,
   if (tmp_border)
     {
       *border = *tmp_border;
-      g_free (tmp_border);
+      gtk_border_free (tmp_border);
       return;
     }