diff --git a/ChangeLog b/ChangeLog
index baa3f6b1d7..5e09d4e6d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-24  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Christian Kirbach <Christian dot Kirbach at googlemail com>
+
+	* sys/ximage/ximagesink.c:
+	  Fix build if XShm is not available (#432362).
+
 2007-04-24  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_init):
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index 3ecd805534..af50cc0f41 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -293,7 +293,6 @@ gst_ximage_buffer_get_type (void)
 
 /* X11 stuff */
 
-#ifdef HAVE_XSHM                /* Check that XShm calls actually work */
 static gboolean error_caught = FALSE;
 
 static int
@@ -307,6 +306,8 @@ gst_ximagesink_handle_xerror (Display * display, XErrorEvent * xevent)
   return 0;
 }
 
+#ifdef HAVE_XSHM                /* Check that XShm calls actually work */
+
 static gboolean
 gst_ximagesink_check_xshm_calls (GstXImageSink * ximagesink,
     GstXContext * xcontext)