diff --git a/ChangeLog b/ChangeLog
index 21395dabc..1d5ce37f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-04  Thomas Thurman  <tthurman@gnome.org>
+
+        * src/core/compositor.c: only use compositor version if
+	we have a compositor. Closes #514453.
+
 2008-02-04  Thomas Thurman  <tthurman@gnome.org>
 
         * configure.in, src/ui/ui.c: remove workaround for a problem
diff --git a/src/core/compositor.c b/src/core/compositor.c
index c44a6d688..79d1206d8 100644
--- a/src/core/compositor.c
+++ b/src/core/compositor.c
@@ -55,6 +55,7 @@
 
 #define USE_IDLE_REPAINT 1
 
+#ifdef HAVE_COMPOSITE_EXTENSIONS
 static inline gboolean
 composite_at_least_version (MetaDisplay *display,
                             int maj, int minor)
@@ -69,6 +70,8 @@ composite_at_least_version (MetaDisplay *display,
 #define have_cow(display) \
   composite_at_least_version (display, 0, 3)
 
+#endif
+
 typedef enum _MetaCompWindowType
 {
   META_COMP_WINDOW_NORMAL,