diff --git a/ChangeLog b/ChangeLog
index b46cb8950..bb9ee232f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-13  Chema Celorio  <chema@celorio.com>
+
+	* autogen.sh (PKG_NAME): check for capplets/common/capplet-util.h
+
+	* configure.in (capplet_modules): pkgconfig 0.8.0 now handles
+	gnome-vfs. No need to call gnome-vfs-config.
+
 2001-07-13  Bradford Hovinen  <hovinen@ximian.com>
 
 	* capplets/Makefile.am (always_built_SUBDIRS): Add common
diff --git a/autogen.sh b/autogen.sh
index 8102af811..31bf3e61f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,8 +6,7 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="GNOME Control Center"
 
-(test -f $srcdir/configure.in \
-  && test -d $srcdir/capplets \
+(test -f $srcdir/capplets/common/capplet-util.h \
   && test -d $srcdir/control-center) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level "\`$PKG_NAME\'" directory"
diff --git a/configure.in b/configure.in
index 8268d018b..5b47991e6 100644
--- a/configure.in
+++ b/configure.in
@@ -108,20 +108,13 @@ PKG_CHECK_MODULES(CAPPLET, $capplet_modules)
 PKG_CHECK_MODULES(BG_CAPPLET, $capplet_modules gdk_pixbuf_xlib)
 PKG_CHECK_MODULES(SCREENSAVER_CAPPLET, $capplet_modules gal)
 PKG_CHECK_MODULES(ROLLBACK_CAPPLET, $capplet_modules)
-PKG_CHECK_MODULES(VFS_CAPPLET, $capplet_modules)
+PKG_CHECK_MODULES(VFS_CAPPLET, $capplet_modules vfs)
 PKG_CHECK_MODULES(GNOMECC, gnomeui libglade xml gdk_pixbuf gnomecanvaspixbuf bonobo bonobox gtkhtml)
 PKG_CHECK_MODULES(RMHELPER, gnomeui gnomecanvaspixbuf)
 PKG_CHECK_MODULES(ARCHIVER, bonobo xml)
 PKG_CHECK_MODULES(MONIKER, bonobo bonobo_conf xml)
 PKG_CHECK_MODULES(CONFIG_ARCHIVER, gnome xml)
 
-dnl gnome-vfs doesn't support gnome-config or pkg-config
-VFS_CFLAGS=`gnome-vfs-config --cflags`
-VFS_LIBS=`gnome-vfs-config --libs`
-
-VFS_CAPPLET_CFLAGS="$VFS_CAPPLET_CFLAGS $VFS_CFLAGS"
-VFS_CAPPLET_LIBS="$VFS_CAPPLET_LIBS $VFS_LIBS"
-
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)