diff --git a/ChangeLog b/ChangeLog
index 164f06b47d..5394841f9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-01-19  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkprivate-x11.h (XID_FONT_BIT): 
+	* gdk/x11/gdkfont-x11.c: 
+	* gdk/x11/gdkxid.c: Use an unused high bit in the
+	XID to mark fonts in the global xid hash table.
+
+	* gdk/x11/gdkcursor-x11.c (update_cursor): Skip fonts
+	when iterating over the xid hash table, since calling
+	GDK_IS_WINDOW () on an GdkFont can cause a segfault.
+	(#327751, Ryan Lortie)
+
 2006-01-19  Matthias Clasen  <mclasen@redhat.com>
 	
 	* gtk/gtkassistant.[hc]: Use a priv pointer for
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 164f06b47d..5394841f9c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2006-01-19  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkprivate-x11.h (XID_FONT_BIT): 
+	* gdk/x11/gdkfont-x11.c: 
+	* gdk/x11/gdkxid.c: Use an unused high bit in the
+	XID to mark fonts in the global xid hash table.
+
+	* gdk/x11/gdkcursor-x11.c (update_cursor): Skip fonts
+	when iterating over the xid hash table, since calling
+	GDK_IS_WINDOW () on an GdkFont can cause a segfault.
+	(#327751, Ryan Lortie)
+
 2006-01-19  Matthias Clasen  <mclasen@redhat.com>
 	
 	* gtk/gtkassistant.[hc]: Use a priv pointer for