diff --git a/dconf.spec b/dconf.spec
index 8d87870..0364b2c 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -3,7 +3,7 @@
 
 Name:           dconf
 Version:        0.7.3
-Release:        1
+Release:        2
 Summary:        A configuration system
 
 Group:          System Environment/Base
@@ -12,6 +12,9 @@ URL:            http://live.gnome.org/dconf
 #VCS:           git:git://git.gnome.org/dconf
 Source0:        http://download.gnome.org/sources/dconf/0.7/dconf-%{version}.tar.bz2
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=646220
+Patch0: dconf-editor-crash.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  dbus-devel
 Requires:       dbus
@@ -52,6 +55,7 @@ docnf-editor allows you to browse and modify dconf databases.
 
 %prep
 %setup -q
+%patch0 -p1 -b .editor-crash
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
@@ -105,6 +109,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 %{_datadir}/dconf-editor/dconf-editor.ui
 
 %changelog
+* Wed Apr  6 2011 Matthias Clasen <mclasen@redhat.com> - 0.7.3-2
+- Fix a crash in dconf-editor
+
 * Tue Mar 22 2011 Tomas Bzatek <tbzatek@redhat.com> - 0.7.3-1
 - Update to 0.7.3