diff --git a/ChangeLog b/ChangeLog
index cf78740846..4d8da030ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-10-25  Matthias Clasen  <mclasen@redhat.com>
 
+	* gdk/x11/gdkxftdefaults.c (init_xft_settings): Make the 
+	initialization of screen_x11->xft_rgba more explicit.  (#319627,
+	Bogdan Nicula)
+
 	* gtk/gtkfilechooser.c (gtk_file_chooser_class_init): Fix whitespace
 	in a blurb.  (#319499, Francisco Javier F. Serrador)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cf78740846..4d8da030ec 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-10-25  Matthias Clasen  <mclasen@redhat.com>
 
+	* gdk/x11/gdkxftdefaults.c (init_xft_settings): Make the 
+	initialization of screen_x11->xft_rgba more explicit.  (#319627,
+	Bogdan Nicula)
+
 	* gtk/gtkfilechooser.c (gtk_file_chooser_class_init): Fix whitespace
 	in a blurb.  (#319499, Francisco Javier F. Serrador)
 
diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c
index dd792642c2..79dd26cd32 100644
--- a/gdk/x11/gdkxftdefaults.c
+++ b/gdk/x11/gdkxftdefaults.c
@@ -200,9 +200,9 @@ init_xft_settings (GdkScreen *screen)
 	      break;
 	    }
 	}
+#endif
 
       screen_x11->xft_rgba = subpixel;
-#endif
     }
 
   if (!get_double_default (xdisplay, "dpi", &dpi_double))