diff --git a/ChangeLog b/ChangeLog
index f76333b90a..996e00f30c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-02  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
+	* sys/ximage/ximagesink.c: (gst_ximagesink_sinkconnect):
+	  Comment out internal resize. It doesn't handle the resulting
+	  XEvent internally, does another try_set_caps() which leads to
+	  a really nice loop.
+	  Real fix will come when Julien and Dave are awake. ;).
+
 2004-01-02  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/mpeg2enc/gstmpeg2enc.cc:
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index 8891665678..dd0a18ee65 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -588,11 +588,11 @@ gst_ximagesink_sinkconnect (GstPad *pad, const GstCaps *caps)
     ximagesink->xwindow = gst_ximagesink_xwindow_new (ximagesink,
                                              GST_VIDEOSINK_WIDTH (ximagesink),
                                              GST_VIDEOSINK_HEIGHT (ximagesink));
-  else
+  /*else
     XResizeWindow (ximagesink->xcontext->disp,
 		   ximagesink->xwindow->win,
 		   GST_VIDEOSINK_WIDTH (ximagesink),
-		   GST_VIDEOSINK_HEIGHT (ximagesink));
+		   GST_VIDEOSINK_HEIGHT (ximagesink));*/
   
   if ( (ximagesink->ximage) &&
        ( (GST_VIDEOSINK_WIDTH (ximagesink) != ximagesink->ximage->width) ||