diff --git a/ChangeLog b/ChangeLog
index 0bb8c5b30..fe8f99ac2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-18  Bradford Hovinen  <hovinen@ximian.com>
+
+	* capplets/Makefile.am (always_built_SUBDIRS): Put common in
+	always_built_SUBDIRS
+
+	* configure.in (dnl): Remove --enable-bonobo-conf option
+
 2001-10-11  Israel Escalante  <israel@ximian.com>
 
 	* configure.in: Bump version to 1.5.10
diff --git a/capplets/Makefile.am b/capplets/Makefile.am
index 80fd25270..a0d4db39c 100644
--- a/capplets/Makefile.am
+++ b/capplets/Makefile.am
@@ -1,7 +1,7 @@
 always_built_SUBDIRS =						\
-	background keyboard mouse screensaver sound 	\
+	common background keyboard mouse screensaver sound 	\
 	default-applications desktop-links
 
 #rollback
 
-SUBDIRS =  $(LIBCOMMON_DIR) $(always_built_SUBDIRS)
+SUBDIRS =  $(always_built_SUBDIRS)
diff --git a/configure.in b/configure.in
index b3fea9056..a3824d794 100644
--- a/configure.in
+++ b/configure.in
@@ -88,8 +88,6 @@ fi
 dnl ==============================================
 dnl Check for pkg-config 
 dnl ==============================================
-
-
 dnl ==============================================
 dnl Check for --enable-bonobo-conf option
 dnl ==============================================
@@ -117,25 +115,17 @@ LIBCOMMON_DIR=
 moniker_enable=
 fi
 
-AC_SUBST(LIBCOMMON_DIR)
-
-AM_CONDITIONAL(BONOBO_CONF_ENABLE, test "x$bonobo_conf_enable" = "xyes")
-AM_CONDITIONAL(LIBCOMMON_ENABLE, test "x$libcommon_enable" = "xyes")
-AM_CONDITIONAL(MONIKER_ENABLE, test "x$moniker_enable" = "xyes")
 
 dnl ==============================================
 dnl Check that we meet the  dependencies
 dnl ==============================================
 capplet_modules="libcapplet >= 1.5.4 libglade-gnome gdk_pixbuf gdk_pixbuf_xlib gal >= 0.12"
-PKG_CHECK_MODULES(CAPPLET, $capplet_modules $PKG_BONOBO_CONF_CHECK)
-PKG_CHECK_MODULES(GNOMECC, gnomeui libglade xml gdk_pixbuf gnomecanvaspixbuf $PKG_BONOBO_CHECK gtkhtml >= 0.15.0)
+PKG_CHECK_MODULES(CAPPLET, $capplet_modules bonobo bonobo_conf >= 0.12)
+PKG_CHECK_MODULES(GNOMECC, gnomeui libglade xml gdk_pixbuf gnomecanvaspixbuf bonobo bonobox gtkhtml >= 0.15.0)
 PKG_CHECK_MODULES(RMHELPER, gnomeui gnomecanvaspixbuf)
-PKG_CHECK_MODULES(ARCHIVER, $PKG_BONOBO_CONF_CHECK xml)
+PKG_CHECK_MODULES(ARCHIVER, bonobo bonobo_conf >= 0.12 xml)
 PKG_CHECK_MODULES(CONFIG_ARCHIVER, bonobo gnome xml)
-
-if test "x$moniker_enable" = "xyes"; then
-PKG_CHECK_MODULES(MONIKER, $PKG_BONOBO_CONF_CHECK xml)
-fi
+PKG_CHECK_MODULES(MONIKER, bonobo bonobo_conf >= 0.12 xml)
 
 AC_PATH_PROG(XSCREENSAVER, xscreensaver, no)
 if test "$XSCREENSAVER" = no ; then