diff --git a/ChangeLog b/ChangeLog
index e024b142c..428108d7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* configure.in (AC_ARG_ENABLE): Fix problem where meaning of
 	--enable-bonobo-conf was the opposite of what it should have been
+	(CC_USE_BONOBO_CONF): Stupid, stupid autoconf
 
 2001-07-25  Chema Celorio  <chema@celorio.com>
 
diff --git a/configure.in b/configure.in
index c077495de..e26b22f8d 100644
--- a/configure.in
+++ b/configure.in
@@ -94,11 +94,10 @@ dnl ==============================================
 dnl Check for --enable-bonobo-conf option
 dnl ==============================================
 
-CC_USE_BONOBO_CONF=yes
-
 AC_ARG_ENABLE(bonobo-conf,[     --disable-bonobo-conf    Disable bonobo-conf support in the capplets],[
-],[
 CC_USE_BONOBO_CONF=no
+],[
+CC_USE_BONOBO_CONF=yes
 ])
 
 if test "x$CC_USE_BONOBO_CONF" = "xyes"; then