diff --git a/ChangeLog b/ChangeLog
index ee392a273c..2efe6d50f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-09  Matthias Clasen <mclasen@redhat.com>
 
+	* gdk/x11/gdkfonts-x11.c: Fix small theoretical memory leaks.
+	(#353916, Chris Wilson)
+
 	* gtk/gtksettings.c (_gtk_settings_reset_rc_values):
 	Don't leak the to_reset list.  (#353914, Chris Wilson)
 
diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c
index 16d93e27f5..846ea535ac 100644
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@@ -67,7 +67,8 @@ gdk_font_name_hash_get (GdkDisplay *display)
   if (!result)
     {
       result = g_hash_table_new (g_str_hash, g_str_equal);
-      g_object_set_qdata (G_OBJECT (display), font_name_quark, result);
+      g_object_set_qdata_full (G_OBJECT (display),
+         font_name_quark, result, (GDestroyNotify) g_hash_table_destroy);
     }
 
   return result;
@@ -87,7 +88,8 @@ gdk_fontset_name_hash_get (GdkDisplay *display)
   if (!result)
     {
       result = g_hash_table_new (g_str_hash, g_str_equal);
-      g_object_set_qdata (G_OBJECT (display), fontset_name_quark, result);
+      g_object_set_qdata_full (G_OBJECT (display),
+         fontset_name_quark, result, (GDestroyNotify) g_hash_table_destroy);
     }
 
   return result;