diff --git a/ChangeLog b/ChangeLog
index dfcb9c2571..1b137a0be4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-12  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 564066 – Crash in gtk_rc_parse_default_files
+
+	* gtk/gtkrc.c (gtk_rc_parse_default_files): Handle being called
+	early. Bug report by Andrés G. Aragoneses
+
 2008-12-12  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkmountoperation.c: Set an empty title on password dialogs.
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index adf3c925ec..80bd402954 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -837,6 +837,8 @@ gtk_rc_parse_default_files (GtkRcContext *context)
 {
   gint i;
 
+  gtk_rc_add_initial_default_files ();
+
   for (i = 0; gtk_rc_default_files[i] != NULL; i++)
     gtk_rc_context_parse_file (context, gtk_rc_default_files[i], GTK_PATH_PRIO_RC, FALSE);
 }