diff --git a/.cvsignore b/.cvsignore
index 8ebb08b..5d35c20 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dconf-0.4.tar.bz2
+dconf-0.4.1.tar.bz2
diff --git a/dconf.spec b/dconf.spec
index 1ed4b40..832dc31 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -1,8 +1,8 @@
-%define glib2_version 2.25.9
+%define glib2_version 2.25.10
 
 Name:           dconf
-Version:        0.4
-Release:        2
+Version:        0.4.1
+Release:        1
 Summary:        A configuration system
 
 Group:          System Environment/Base
@@ -14,8 +14,10 @@ Source0:        http://download.gnome.org/sources/dconf/0.4/dconf-%{version}.tar
 BuildRequires:  glib2-devel >= %{glib2_version}
 Requires:       dbus
 
-Patch0:         dconf-libs.patch
-BuildRequires:  automake autoconf libtool
+BuildRequires:  gtk2-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  vala-devel
+BuildRequires:  libgee-devel
 BuildRequires:  gobject-introspection-devel
 
 %description
@@ -32,12 +34,17 @@ Requires: glib2-devel >= %{glib2_version}
 dconf development package. Contains files needed for doing software
 development using dconf.
 
+%package editor
+Summary: Configuration editor for dconf
+Group:   Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description editor
+docnf-editor allows you to browse and modify dconf databases.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .libs
-
-automake --foreign
-autoconf
 
 %build
 %configure --disable-static
@@ -76,7 +83,15 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 %{_datadir}/gir-1.0/dconf-0.3.gir
 %{_datadir}/gtk-doc/html/dconf
 
+%files editor
+%defattr(-,root,root,-)
+%{_bindir}/dconf-editor
+
 %changelog
+* Sat Jun 26 2010 Matthias Clasen <mclasen@redhat.com> 0.4.1-1
+- Update to 0.4.1
+- Include dconf-editor (in a subpackage)
+
 * Wed Jun 23 2010 Matthias Clasen <mclasen@redhat.com> 0.4-2
 - Rebuild against glib 2.25.9
 
diff --git a/sources b/sources
index b2eb83c..f3303b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61f4a82b6f6a3c6ae2205eff347874c2  dconf-0.4.tar.bz2
+c6b3b57b21475b5fb1e56fec68138bf8  dconf-0.4.1.tar.bz2