diff --git a/gnome-bluetooth-0.8.0-desktop.patch b/gnome-bluetooth-0.8.0-desktop.patch
deleted file mode 100644
index 8e79f3d..0000000
--- a/gnome-bluetooth-0.8.0-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-bluetooth-0.8.0/obex/gnome-obex-server.desktop.in.dfix	2007-03-09 15:28:30.000000000 +0100
-+++ gnome-bluetooth-0.8.0/obex/gnome-obex-server.desktop.in	2007-03-09 15:28:41.000000000 +0100
-@@ -4,7 +4,7 @@
- _Comment=Receive files sent by Bluetooth devices
- Icon=blueradio-48
- Exec=gnome-obex-server
--Terminal=0
-+Terminal=false
- Type=Application
- Categories=Application;System;
- X-GNOME-Bugzilla-Bugzilla=GNOME
diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index e464786..568cdcc 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.11.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and LGPLv2+
 Group: System Environment/Libraries
 URL: http://live.gnome.org/GnomeBluetooth
@@ -22,14 +22,8 @@ Requires(preun): GConf2
 Requires: bluez-utils
 ExcludeArch: s390 s390x
 
-Patch1: gnome-bluetooth-0.8.0-desktop.patch
-
 %description
-This package contains a Bonobo server to control Bluetooth devices,
-and a simple GUI to explore which devices are available
-(gnome-bluetooth-manager).  Also, an OBEX server is available,
-gnome-obex-server.  This will receive files sent via Bluetooth to your PC,
-and save them in your home directory.
+This package contains a library with widgets for Bluetooth applications.
 
 %package libs
 Summary: Libraries for applications, which use gnome-bluetooth
@@ -52,7 +46,6 @@ which will use gnome-bluetooth.
 
 %prep
 %setup -q
-%patch1 -p1 -b .dfix
 
 %build
 %configure
@@ -73,6 +66,9 @@ if [ $RPM_BUILD_ROOT/usr/lib/ != $RPM_BUILD_ROOT%{_libdir}/ ] ; then
 	rmdir $RPM_BUILD_ROOT/usr/lib
 fi
 
+# Remove the gnome-obex-server
+rm -rf $RPM_BUILD_ROOT%{_bindir}/ $RPM_BUILD_ROOT%{_datadir}/applications/ $RPM_BUILD_ROOT%{_sysconfdir}/
+
 %find_lang %{name}
 
 %clean
@@ -81,35 +77,31 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas >/dev/null || :
+    if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then
+      gconftool-2 --makefile-uninstall-rule \
+        %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas >/dev/null || :
+    fi
 fi
 
 %post libs -p /sbin/ldconfig
 
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || :
-
 %postun libs -p /sbin/ldconfig
 
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || :
+    if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then
+      gconftool-2 --makefile-uninstall-rule \
+        %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || :
+    fi
 fi
 
 %files -f %{name}.lang
 %defattr(-, root, root)
 #GPLv2
 %doc AUTHORS COPYING ChangeLog NEWS README 
-%{_bindir}/gnome-obex-server
-%{_datadir}/applications/gnome-obex-server.desktop
 %{_datadir}/gnome-bluetooth/
 %{_datadir}/pixmaps/*
-%config(noreplace) %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas
 
 %files libs
 %defattr(-, root, root)
@@ -129,6 +121,9 @@ fi
 %{_libdir}/libgnomebt.so
 
 %changelog
+* Wed Feb 27 2008 - Bastien Nocera <bnocera@redhat.com> - 0.11.0-3
+- Remove gnome-obex-server, we should use gnome-user-share now
+
 * Mon Feb 11 2008 - Ondrej Vasik <ovasik@redhat.com> - 0.11.0-1
 - gcc43 rebuild