diff --git a/ChangeLog b/ChangeLog
index 6afc74ae35..23ec475ad7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-21  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* sys/ximage/ximagesink.c: (gst_ximagesink_handle_xevents):
+	* sys/xvimage/xvimagesink.c: (gst_xvimagesink_handle_xevents):
+	Fix a locking-order bug I introduced with my changes the other day.
+	Patch by Mike Smith.
+
 2007-05-21  Michael Smith <msmith@fluendo.com>
 
 	* ext/theora/theoradec.c: (theora_handle_data_packet):
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index 7f2a1d37de..6acc167864 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -1041,8 +1041,8 @@ gst_ximagesink_handle_xevents (GstXImageSink * ximagesink)
 
     gst_ximagesink_expose (GST_X_OVERLAY (ximagesink));
 
-    g_mutex_lock (ximagesink->x_lock);
     g_mutex_lock (ximagesink->flow_lock);
+    g_mutex_lock (ximagesink->x_lock);
   }
 
   /* Handle Display events */
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 2f19443a03..a2635ff721 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -1177,8 +1177,8 @@ gst_xvimagesink_handle_xevents (GstXvImageSink * xvimagesink)
 
     gst_xvimagesink_expose (GST_X_OVERLAY (xvimagesink));
 
-    g_mutex_lock (xvimagesink->x_lock);
     g_mutex_lock (xvimagesink->flow_lock);
+    g_mutex_lock (xvimagesink->x_lock);
   }
 
   /* Handle Display events */