diff --git a/gnome-bluetooth-2.30.0.tar.bz2 b/gnome-bluetooth-2.30.0.tar.bz2
deleted file mode 100644
index c48eba5..0000000
--- a/gnome-bluetooth-2.30.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4caafa8c28195c81d8c51414f3a64489f81b9b46cac56979aeaaff8c9ebb78d4
-size 1015602
diff --git a/gnome-bluetooth-2.31.6.tar.bz2 b/gnome-bluetooth-2.31.6.tar.bz2
new file mode 100644
index 0000000..cab3be1
--- /dev/null
+++ b/gnome-bluetooth-2.31.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:050c7f18b9a7640355f4d58f063f943fe2d79bac792bca1752bf186f70a11672
+size 1214926
diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes
index 8c86d2d..abb2392 100644
--- a/gnome-bluetooth.changes
+++ b/gnome-bluetooth.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Aug  6 11:18:41 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.31.6:
+  + Allow setting up devices that do not use pairing
+  + Port to GSettings instead of GConf
+  + Properties:
+    - Add specific page when the only adapter is hard blocked
+      through a physical killswitch
+- Remove --disable-schemas-install from configure call
+  (gconf-specific) and update packaging to handle GSettings schemas
+  instead of gconf schemas.
+- Rename libgnome-bluetooth7 to libgnome-bluetooth8 after bump in
+  library soname.
+
 -------------------------------------------------------------------
 Tue Aug  3 19:43:52 UTC 2010 - dimstar@opensuse.org
 
diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index 8565fe8..5cbbc00 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-bluetooth (Version 2.30.0)
+# spec file for package gnome-bluetooth (Version 2.31.6)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,8 +18,8 @@
 
 
 Name:           gnome-bluetooth
-Version:        2.30.0
-Release:        3
+Version:        2.31.6
+Release:        1
 License:        GPLv2+
 Summary:        GNOME Bluetooth graphical utilities
 Url:            http://live.gnome.org/GnomeBluetooth
@@ -28,6 +28,7 @@ Source:         http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-blu
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
 Patch0:         lxde-support.patch
 BuildRequires:  fdupes
+# Needed for geoclue plugin
 BuildRequires:  gconf2-devel
 BuildRequires:  gir-repository
 BuildRequires:  gnome-doc-utils-devel
@@ -46,7 +47,7 @@ Requires:       obexd
 Provides:       bluez-gnome = 1.8
 Obsoletes:      bluez-gnome < 1.8
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%gconf_schemas_prereq
+%glib2_gsettings_schema_requires
 
 %description
 The gnome-bluetooth package contains graphical utilities to setup,
@@ -71,13 +72,13 @@ enables you to send files.  It is used by the Nautilus component --
 select the files you want to send and choose "Send via Bluetooth..."
 from the context menu.
 
-%package -n libgnome-bluetooth7
+%package -n libgnome-bluetooth8
 License:        GPLv2+
 Summary:        GNOME Bluetooth graphical utilities
 Group:          System/GUI/GNOME
 Obsoletes:      libgnomebt1 <= 0.12
 
-%description -n libgnome-bluetooth7
+%description -n libgnome-bluetooth8
 The gnome-bluetooth package contains graphical utilities to setup,
 monitor and use Bluetooth devices.
 
@@ -109,7 +110,7 @@ translation-update-upstream
 %patch0 -p1
 
 %build
-%configure	--disable-schemas-install \
+%configure      \
 		--disable-icon-update \
 		--disable-scrollkeeper \
 		--disable-desktop-update \
@@ -126,29 +127,36 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %suse_update_desktop_file -G "Bluetooth Manager applet" bluetooth-applet
 %find_lang %{name}2
 %find_lang %{name} %{name}2.lang
-%find_gconf_schemas
 %fdupes %{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
-%pre -f %{name}.schemas_pre
+%post
+%glib2_gsettings_schema_post
 
-%posttrans -f %{name}.schemas_posttrans
+%postun
+%glib2_gsettings_schema_postun
 
-%preun -f %{name}.schemas_preun
+%post -n nautilus-sendto-plugin-bluetooth
+%glib2_gsettings_schema_post
 
-%post -n libgnome-bluetooth7 -p /sbin/ldconfig
+%postun -n nautilus-sendto-plugin-bluetooth
+%glib2_gsettings_schema_postun
 
-%postun -n libgnome-bluetooth7 -p /sbin/ldconfig
+%post -n libgnome-bluetooth8 -p /sbin/ldconfig
 
-%files -f %{name}.schemas_list
+%postun -n libgnome-bluetooth8 -p /sbin/ldconfig
+
+%files
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/bluetooth-*
 %{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
 %{_datadir}/applications/bluetooth-properties.desktop
-%{_datadir}/gnome-bluetooth
+%{_datadir}/GConf/gsettings/gnome-bluetooth
+%{_datadir}/glib-2.0/schemas/org.gnome.Bluetooth.gschema.xml
+%{_datadir}/gnome-bluetooth/
 %{_datadir}/icons/hicolor/*/*/bluetooth*
 %{_mandir}/man1/bluetooth-*
 # Own the plugin directory, but exclude the plugin library itself
@@ -159,7 +167,7 @@ rm -rf %{buildroot}
 
 %files lang -f %{name}2.lang
 
-%files -n libgnome-bluetooth7
+%files -n libgnome-bluetooth8
 %defattr(-,root,root,-)
 %{_libdir}/libgnome-bluetooth.so.*
 %{_libdir}/girepository-1.0/*.typelib
@@ -178,6 +186,8 @@ rm -rf %{buildroot}
 
 %files -n nautilus-sendto-plugin-bluetooth
 %defattr(-,root,root,-)
+%{_datadir}/GConf/gsettings/gnome-bluetooth-nst
+%{_datadir}/glib-2.0/schemas/org.gnome.Bluetooth.nst.gschema.xml
 %{_libdir}/nautilus-sendto/plugins/libnstbluetooth.so
 
 %changelog