diff --git a/ChangeLog b/ChangeLog
index e2afb34809..323f46ab47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-18  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* sys/glsink/glimagesink.c: (gst_glimage_sink_init_display):
+	Update the cached caps after opening the display so that we report
+	only the supported caps formats, not just the template caps.
+	Fixes: #439405
+
 2007-05-18  Stefan Kost  <ensonic@users.sf.net>
 
 	* ext/amrwb/gstamrwbdec.c (gst_amrwbdec_debug, GST_CAT_DEFAULT,
diff --git a/sys/glsink/glimagesink.c b/sys/glsink/glimagesink.c
index 067a03bef7..047fde56b6 100644
--- a/sys/glsink/glimagesink.c
+++ b/sys/glsink/glimagesink.c
@@ -783,6 +783,7 @@ gst_glimage_sink_init_display (GstGLImageSink * glimage_sink)
 #else
   glimage_sink->have_yuv = FALSE;
 #endif
+  gst_glimage_sink_update_caps (glimage_sink);
 
   glXMakeCurrent (glimage_sink->display, None, NULL);
   XDestroyWindow (glimage_sink->display, window);