diff --git a/configure.ac b/configure.ac
index 04140852..7393f9c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -562,9 +562,9 @@ if test x$enable_cddb = x; then
   enable_cddb=yes
   AC_ARG_ENABLE(cddb,
 	[  --enable-cddb           include CDDB lookups in cd_info (default enabled)],	
-	enable_cddb=yes, enable_cddb=no)
+	[], enable_cddb=check)
 fi
-if test x$enable_cddb != "no" ; then
+if test x$enable_cddb != x"no" ; then
    PKG_CHECK_MODULES(CDDB, libcddb >= 1.0.1, [
     HAVE_CDDB=yes 
     AC_DEFINE(HAVE_CDDB, [], [Define this if you have libcddb installed])