diff --git a/gnome-bluetooth-3.4.2.tar.xz b/gnome-bluetooth-3.4.2.tar.xz
deleted file mode 100644
index 00e0e76..0000000
--- a/gnome-bluetooth-3.4.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c58480f1687aca048444d5e4dbd306594d0785c8e6e74f99fa0b13e57fdad4de
-size 1139628
diff --git a/gnome-bluetooth-3.5.5.tar.xz b/gnome-bluetooth-3.5.5.tar.xz
new file mode 100644
index 0000000..a5fa351
--- /dev/null
+++ b/gnome-bluetooth-3.5.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47b6afbccb04e7fd0c09ab4431ce59b9175e8bac1462068816018da427b43cc2
+size 1330996
diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes
index a7b52d9..97344e8 100644
--- a/gnome-bluetooth.changes
+++ b/gnome-bluetooth.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Aug  8 17:56:41 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.5:
+  + Allow building with nautilus-sendto 3.6
+  + Namespace killswitch API properly
+  + Loads of API documentation fixes
+
+-------------------------------------------------------------------
+Wed Jul 18 11:05:55 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.4:
+  + Library: Fix stuck "Finishing" page for some devices.
+  + Applet: Fix warning and empty device name in some cases.
+  + Wizard: Use shorter label for the finishing pages.
+- Rename libgnome-bluetooth10 subpackage to libgnome-bluetooth11,
+  following upstreams soname bump.
+
 -------------------------------------------------------------------
 Wed Jul  4 21:25:17 UTC 2012 - dimstar@opensuse.org
 
diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index 112d7fa..2c6085e 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -16,25 +16,27 @@
 #
 
 
+%define BUILD_FROM_VCS 1
+
 Name:           gnome-bluetooth
-Version:        3.4.2
+Version:        3.5.5
 Release:        0
 Summary:        GNOME Bluetooth graphical utilities
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://live.gnome.org/GnomeBluetooth
-Source:         http://download.gnome.org/sources/gnome-bluetooth/3.4/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnome-bluetooth/3.5/%{name}-%{version}.tar.xz
 Source1:        61-gnome-bluetooth-rfkill.rules
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
+# PATCH-FIX-UPSTREAM lxde-support.patch bgo#683054 andrea@opensuse.org -- Use gnome-bluetooth applet on LXDE Desktop.
 Patch0:         lxde-support.patch
 BuildRequires:  fdupes
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
-BuildRequires:  libnotify-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gtk+-3.0) >= 2.90.7
+BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(nautilus-sendto)
 %if 0%{?BUILD_FROM_VCS}
 BuildRequires:  gnome-common
@@ -68,12 +70,12 @@ Provides:       libgnomebt-devel = 0.12
 The gnome-bluetooth package contains graphical utilities to setup,
 monitor and use Bluetooth devices.
 
-%package -n libgnome-bluetooth10
+%package -n libgnome-bluetooth11
 Summary:        GNOME Bluetooth graphical utilities
 Group:          System/Libraries
 Obsoletes:      libgnomebt1 <= 0.12
 
-%description -n libgnome-bluetooth10
+%description -n libgnome-bluetooth11
 The gnome-bluetooth package contains graphical utilities to setup,
 monitor and use Bluetooth devices.
 
@@ -115,7 +117,8 @@ translation-update-upstream
 %patch0 -p1
 
 %if 0%{?BUILD_FROM_VCS}
-[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
+[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh || NOCONFIGURE=1 gnome-autogen.sh
+
 %endif
 
 %build
@@ -128,10 +131,10 @@ translation-update-upstream
 %endif
         --enable-nautilus-sendto=yes\
         --enable-introspection
-%__make %{?_smp_mflags} V=1
+make %{?_smp_mflags} V=1
 
 %install
-%makeinstall
+%make_install
 find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 %suse_update_desktop_file bluetooth-applet
 %suse_update_desktop_file bluetooth-sendto
@@ -160,9 +163,9 @@ rm -rf %{buildroot}
 %postun -n nautilus-sendto-plugin-bluetooth
 %glib2_gsettings_schema_postun
 
-%post -n libgnome-bluetooth10 -p /sbin/ldconfig
+%post -n libgnome-bluetooth11 -p /sbin/ldconfig
 
-%postun -n libgnome-bluetooth10 -p /sbin/ldconfig
+%postun -n libgnome-bluetooth11 -p /sbin/ldconfig
 
 %files
 %defattr(-, root, root)
@@ -192,7 +195,7 @@ rm -rf %{buildroot}
 
 %files lang -f %{name}2.lang
 
-%files -n libgnome-bluetooth10
+%files -n libgnome-bluetooth11
 %defattr(-,root,root,-)
 %{_libdir}/libgnome-bluetooth.so.*