diff --git a/dconf-0.20.0.tar.xz b/dconf-0.20.0.tar.xz
deleted file mode 100644
index 8ae4eb5..0000000
--- a/dconf-0.20.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22c046a247d05ea65ad181e3aef4009c898a5531f76c0181f8ec0dfef83447d9
-size 389388
diff --git a/dconf-0.21.0.tar.xz b/dconf-0.21.0.tar.xz
new file mode 100644
index 0000000..c41730e
--- /dev/null
+++ b/dconf-0.21.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:600a620db8367fd757ffc4cf2f44d76ea14e90279ac289b269424e773a1d950b
+size 389356
diff --git a/dconf.changes b/dconf.changes
index 783d932..07759d0 100644
--- a/dconf.changes
+++ b/dconf.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Aug  5 20:04:07 UTC 2014 - dimstar@opensuse.org
+
+- Update to version 0.21.0:
+  + Editor desktop file renamed to ca.desrt.dconf-editor to take
+    advantage of D-Bus activation.
+  + Prevent the service from being released more than once if we
+    receive multiple signals.
+  + Updated translations.
+
 -------------------------------------------------------------------
 Tue Aug  5 20:04:06 UTC 2014 - dimstar@opensuse.org
 
diff --git a/dconf.spec b/dconf.spec
index 58e8660..b943199 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -17,13 +17,13 @@
 
 
 Name:           dconf
-Version:        0.20.0
+Version:        0.21.0
 Release:        0
 Summary:        Simple key-based configuration system
 License:        LGPL-2.1+
 Group:          System/Libraries
 Url:            http://live.gnome.org/dconf
-Source:         http://download.gnome.org/sources/dconf/0.20/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/dconf/0.21/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM dconf-use-g_settings_get_default_value.patch bnc#873225 bgo#668234 mgorse@suse.com -- Have editor display correct default value when an administrator has a custom database.
 Patch0:         dconf-use-g_settings_get_default_value.patch
@@ -146,7 +146,7 @@ have configuration storage systems.
 %install
 %makeinstall
 find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
-%suse_update_desktop_file %{buildroot}%{_datadir}/applications/dconf-editor.desktop SystemSetup X-GNOME-SystemSettings
+%suse_update_desktop_file %{buildroot}%{_datadir}/applications/ca.desrt.dconf-editor.desktop SystemSetup X-GNOME-SystemSettings
 mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
 %find_lang %{name}
 
@@ -210,7 +210,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
 %files editor
 %defattr(-, root, root)
 %{_bindir}/dconf-editor
-%{_datadir}/applications/dconf-editor.desktop
+%{_datadir}/applications/ca.desrt.dconf-editor.desktop
+%{_datadir}/dbus-1/services/ca.desrt.dconf-editor.service
 %{_datadir}/glib-2.0/schemas/ca.desrt.dconf-editor.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/dconf-editor.png
 %{_datadir}/icons/HighContrast/