diff --git a/ChangeLog b/ChangeLog
index 8a9ce59abd..56d736e6ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-17  Benjamin Otte  <otte@gnome.org>
+
+	* sys/xvimage/xvimagesink.c: (gst_xvimagesink_get_xv_support),
+	(gst_xvimagesink_xcontext_get), (gst_xvimagesink_change_state),
+	(gst_xvimagesink_set_xwindow_id):
+	  call GST_ELEMENT_ERROR whenever get_xcontext fails. Includes
+	  assorted cleanup fixes.
+
 2004-04-16  David Schleef  <ds@schleef.org>
 
 	* sys/ximage/ximagesink.h: Compile fix for FreeBSD. (bug #140268)
diff --git a/common b/common
index d03e438809..e55182f6ee 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit d03e4388098656fa65df4d3a29e40fc556173d2d
+Subproject commit e55182f6eece70ff99e33b9800b27a926670dbdd