diff --git a/ChangeLog b/ChangeLog
index fb2a9f0fd3..1581614624 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-11  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	Patch by: Branko Čibej <brane at xbc dot nu>
+
+	* sys/xvimage/xvimagesink.c:
+	Fix build of xvimagesink if we don't have XShm, e.g. on Mac OS X.
+	Fixes bug #515654.
+
 2008-02-09  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
 	* gst/playback/gstplaybasebin.c:
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index bfa24f965f..c9b63b5747 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -395,7 +395,6 @@ gst_xvimage_buffer_get_type (void)
 
 /* X11 stuff */
 
-#ifdef HAVE_XSHM
 static gboolean error_caught = FALSE;
 
 static int
@@ -409,6 +408,7 @@ gst_xvimagesink_handle_xerror (Display * display, XErrorEvent * xevent)
   return 0;
 }
 
+#ifdef HAVE_XSHM
 /* This function checks that it is actually really possible to create an image
    using XShm */
 static gboolean