diff --git a/ChangeLog b/ChangeLog
index 037334dbc..a2237b4c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-10  Matt Kraai  <kraai@ftfbs.org>
+
+        Don't define meta_spew_event unless verbose mode is on.
+	Closes #571126.
+
+	* src/core/display.c:
+	* src/core/window.c:
+
 2009-02-10  Matt Kraai  <kraai@ftfbs.org>
 
 	* README: switch is "--disable-verbose-mode", not "--disable-verbose".
diff --git a/src/core/display.c b/src/core/display.c
index ef06d6a94..70b952a3f 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -135,8 +135,10 @@ typedef struct
  */
 static MetaDisplay *the_display = NULL;
 
+#ifdef WITH_VERBOSE_MODE
 static void   meta_spew_event           (MetaDisplay    *display,
                                          XEvent         *event);
+#endif
 
 static gboolean event_callback          (XEvent         *event,
                                          gpointer        data);
diff --git a/src/core/window.c b/src/core/window.c
index 905f9c392..c9bc037fc 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1692,8 +1692,10 @@ idle_calc_showing (gpointer data)
   return FALSE;
 }
 
+#ifdef WITH_VERBOSE_MODE
 static const gchar* meta_window_queue_names[NUMBER_OF_QUEUES] =
   {"calc_showing", "move_resize", "update_icon"};
+#endif
 
 static void
 meta_window_unqueue (MetaWindow *window, guint queuebits)