diff --git a/GConf-settings-migration.patch b/GConf-settings-migration.patch
new file mode 100644
index 0000000..62b6144
--- /dev/null
+++ b/GConf-settings-migration.patch
@@ -0,0 +1,35 @@
+diff -up GConf-2.31.2/gsettings/gsettings-data-convert.desktop.settings-migration GConf-2.31.2/gsettings/gsettings-data-convert.desktop
+--- GConf-2.31.2/gsettings/gsettings-data-convert.desktop.settings-migration	2010-05-21 19:19:16.420451458 -0400
++++ GConf-2.31.2/gsettings/gsettings-data-convert.desktop	2010-05-21 19:32:33.095449226 -0400
+@@ -0,0 +1,9 @@
++[Desktop Entry]
++Version=1.0
++Name=GSettings Data Conversion
++Comment=Migrates user settings from GConf to dconf
++Exec=gsettings-data-convert
++Terminal=false
++Type=Application
++OnlyShowIn=GNOME;
++X-GNOME-Autostart-Phase=Initialization
+diff -up GConf-2.31.2/gsettings/Makefile.am.settings-migration GConf-2.31.2/gsettings/Makefile.am
+--- GConf-2.31.2/gsettings/Makefile.am.settings-migration	2010-04-20 19:47:00.000000000 -0400
++++ GConf-2.31.2/gsettings/Makefile.am	2010-05-21 19:19:16.422449991 -0400
+@@ -35,6 +35,9 @@ gsettings_data_convert_LDADD =          
+ 	$(GSETTINGS_LIBS)                   \
+ 	$(NULL)
+ 
++autostartdir = $(sysconfdir)/xdg/autostart
++autostart_DATA = gsettings-data-convert.desktop
++
+ man_MANS =                       \
+ 	gsettings-data-convert.1 \
+ 	$(NULL)
+@@ -42,7 +45,7 @@ man_MANS =                       \
+ gsettings-data-convert.1 : gsettings-data-convert.xml
+ 	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+ 
+-EXTRA_DIST = gsettings-data-convert.xml gsettings-data-convert.1
++EXTRA_DIST = gsettings-data-convert.xml gsettings-data-convert.1 gsettings-data-convert.desktop
+ 
+ dist-hook-local: $(BUILT_EXTRA_DIST)
+ 	files='$(BUILT_EXTRA_DIST)';                      \
diff --git a/GConf2.spec b/GConf2.spec
index 798d6a9..45fe5ab 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.31.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 #VCS: git:git://git.gnome.org/gconf
@@ -42,6 +42,9 @@ Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=568845
 Patch1: GConf-gettext.patch
 
+Patch2: GConf-settings-migration.patch
+BuildRequires: autoconf automake libtool
+
 %description
 GConf is a process-transparent configuration database API used to
 store user preferences. It has pluggable backends and features to
@@ -77,6 +80,9 @@ which require GTK+.
 %setup -q -n GConf-%{version}
 %patch0 -p1 -b .reload
 %patch1 -p1 -b .gettext
+%patch2 -p1 -b .settings-migration
+
+autoreconf -i -f
 
 %build
 %configure --disable-static --enable-defaults-service
@@ -131,6 +137,7 @@ fi
 %{_bindir}/gconf-merge-tree
 %{_bindir}/gconftool-2
 %{_bindir}/gsettings-data-convert
+%{_sysconfdir}/xdg/autostart/gsettings-data-convert.desktop
 %{_libexecdir}/gconfd-2
 %{_libdir}/*.so.*
 %{_libdir}/GConf/2/*.so
@@ -165,6 +172,9 @@ fi
 %{_datadir}/gir-1.0
 
 %changelog
+* Fri May 21 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.2-4
+- Install an autostart file for gsettings-data-convert
+
 * Wed May 19 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.2-3
 - Rebuild against newer glib