diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index 6b36d03..d36b35e 100644
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -1,4 +1,3 @@
-%define libbonobo_version 2.2.0
 %define samba_version 3.0.8-0.pre1.3
 %define gconf2_version 1.2.0
 %define gtkdoc_version 0.9
@@ -17,7 +16,6 @@ Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
-Source1: gnome-vfs-monikers-%{version}.tar.bz2
 URL: http://www.gnome.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
@@ -25,7 +23,6 @@ Requires:      shared-mime-info
 Requires:      gnome-mount >= %{gnome_mount_version}
 Requires(post): GConf2 >= %{gconf2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
-BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
 BuildRequires: libxml2-devel, zlib-devel
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -74,8 +71,6 @@ Requires:   %{name} = %{version}-%{release}
 Requires:   GConf2-devel >= %{gconf2_version}
 Requires:   hal-devel >= %{hal_version}
 Requires:   dbus-devel >= %{dbus_version}
-Requires:   libbonobo-devel >= %{libbonobo_version}
-Conflicts: bonobo-devel < 1.0.8
 Conflicts: gnome-vfs-devel < 1.0.2
 
 %description devel
@@ -107,8 +102,6 @@ shares (SMB) to applications using GNOME VFS.
 %patch104 -p1 -b .browser_default
 %patch201 -p0 -b .console
 
-tar xjf %{SOURCE1}
-
 %build
 
 if pkg-config openssl ; then
@@ -130,11 +123,6 @@ autoconf
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool
 
-pushd gnome-vfs-monikers-%{version}
-./configure 
-make LIBTOOL=/usr/bin/libtool
-popd
-
 %install
 rm -fr $RPM_BUILD_ROOT
 
@@ -143,18 +131,9 @@ export tagname=CC
 make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-pushd gnome-vfs-monikers-%{version}
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
-popd
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.{a,la}
-
-for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
-    sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
-done
 
 
 %find_lang %{po_package}
@@ -187,8 +166,8 @@ done
 %exclude %{_libdir}/gnome-vfs-2.0/modules/libsmb.so
 %{_libdir}/gnome-vfs-2.0/modules
 %dir %{_libdir}/gnome-vfs-2.0
-%{_libdir}/bonobo
 %{_sysconfdir}/gconf/schemas/*
+%{_datadir}/dbus-1/services/gnome-vfs-daemon.service
 ## conflicts with gnome-vfs 1, ignore for now
 ## %{_datadir}/man/man5/*
 
@@ -208,7 +187,7 @@ done
 
 %changelog
 * Wed Jul 12 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.3-2 
-- Include gnome-vfs-monikers
+- Rebuild
 
 * Wed Jul 12 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.3-1
 - Update to 2.15.3