diff --git a/ChangeLog b/ChangeLog
index 06c49d0d69..d15070ba6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-23  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_destroy):
+	  For completeness, XSync in the destroy function as xvimage does.
+
 2004-09-23  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* ext/gdk_pixbuf/pixbufscale.c: (gst_pixbufscale_getcaps):
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index 8833ac3fc3..0bde940718 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -284,6 +284,7 @@ gst_ximagesink_ximage_destroy (GstXImageSink * ximagesink, GstXImage * ximage)
   if (ximagesink->xcontext->use_xshm) {
     if (ximage->SHMInfo.shmaddr != ((void *) -1)) {
       XShmDetach (ximagesink->xcontext->disp, &ximage->SHMInfo);
+      XSync (xcontext->disp, 0);
       shmdt (ximage->SHMInfo.shmaddr);
     }
     if (ximage->SHMInfo.shmid > 0)