diff --git a/src/cd-info.c b/src/cd-info.c
index 4fa0cef4..ddcb57a7 100644
--- a/src/cd-info.c
+++ b/src/cd-info.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cd-info.c,v 1.141 2005/06/28 15:39:35 rocky Exp $
+    $Id: cd-info.c,v 1.142 2005/07/03 23:14:23 rocky Exp $
 
     Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 1996, 1997, 1998  Gerd Knorr <kraxel@bytesex.org>
@@ -365,15 +365,20 @@ _log_handler (cdio_log_level_t level, const char message[])
   gl_default_cdio_log_handler (level, message);
 }
 
+#ifdef HAVE_CDDB
 static void 
 _cddb_log_handler (cddb_log_level_t level, const char message[])
 {
   /* CDDB errors should not be considered fatal. */
-  if (level == CDIO_LOG_ERROR)
+  if (level == CDDB_LOG_ERROR)
     level = CDIO_LOG_WARN;
+
+  /* Might consider doing some sort of CDDB to cdio to log level conversion,
+     but right now it's a no op. */
   
   _log_handler(level, message);
 }
+#endif
 
 static void 
 print_cdtext_track_info(CdIo_t *p_cdio, track_t i_track, const char *psz_msg) {
@@ -717,8 +722,6 @@ init(void)
 {
   gl_default_cdio_log_handler = cdio_log_set_handler (_log_handler);
 #ifdef HAVE_CDDB
-  
-
   gl_default_cddb_log_handler = 
     cddb_log_set_handler ((cddb_log_handler_t) _cddb_log_handler);
 #endif