diff --git a/.cvsignore b/.cvsignore
index e69de29..b3aa0f9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+gnome-settings-daemon-2.21.5.2.tar.bz2
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
new file mode 100644
index 0000000..badf030
--- /dev/null
+++ b/gnome-settings-daemon.spec
@@ -0,0 +1,126 @@
+Name:		gnome-settings-daemon
+Version:	2.21.5.2
+Release:	2%{?dist}
+Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
+
+Group:		System Environment/Daemons
+License:	GPLv2+
+URL:		http://ftp.gnome.org/pub/gnome/sources/%{name}
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.21/%{name}-%{version}.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires(pre): GConf2 >= 2.14
+Requires(preun): GConf2 >= 2.14
+Requires(post): GConf2 >= 2.14
+
+BuildRequires:	dbus-glib-devel
+BuildRequires:	GConf2-devel 
+BuildRequires:	gtk2-devel
+BuildRequires:	gnome-vfs2-devel
+BuildRequires:	gnome-desktop-devel
+BuildRequires:	libglade2-devel
+BuildRequires:	libgnomeui-devel
+BuildRequires:	libgnome-devel
+BuildRequires:	xorg-x11-proto-devel
+BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-plugins-base-devel
+BuildRequires:	esound-devel
+BuildRequires:	libgnomekbd-devel
+BuildRequires:	gettext
+BuildRequires:	perl(XML::Parser)
+
+%description
+A daemon to share settings from GNOME to other applications. It also 
+handles global keybindings, as well as a number of desktop-wide settings.
+
+%package	devel
+Summary:	Development files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	pkgconfig
+Requires:	dbus-glib-devel
+
+%description	devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%prep
+%setup -q
+
+%build
+%configure --enable-static=no
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+%find_lang %{name} --with-gnome
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+	%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
+	%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
+	%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
+	%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
+	%{_sysconfdir}/gconf/schemas/gnome-settings-daemon.schemas \
+	>& /dev/null || :
+
+%pre
+if [ "$1" -gt 1 ]; then
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	gconftool-2 --makefile-uninstall-rule \
+		%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
+		%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
+		%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
+		%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
+		%{_sysconfdir}/gconf/schemas/gnome-settings-daemon.schemas \
+		>& /dev/null || :
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	gconftool-2 --makefile-uninstall-rule \
+		%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
+		%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
+		%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
+		%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
+		%{_sysconfdir}/gconf/schemas/gnome-settings-daemon.schemas \
+		>& /dev/null || :
+fi
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS 
+%{_sysconfdir}/gconf/schemas/*
+%{_libdir}/gnome-settings-daemon
+%{_libexecdir}/gnome-settings-daemon
+%{_datadir}/gnome-settings-daemon/
+%{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/gnome-settings-daemon-2.0
+%{_libdir}/pkgconfig/gnome-settings-daemon.pc
+
+%changelog
+* Tue Jan 15 2008  Matthias Clasen <mclasen@redhat.com> - 2.21.5.2-2
+- Incorporate review feedback (#428833)
+
+* Tue Jan 15 2008  Matthias Clasen <mclasen@redhat.com> - 2.21.5.2-1
+- Update to 2.21.5.2
+
+* Tue Jan 15 2008  Matthias Clasen <mclasen@redhat.com> - 2.21.5.1-1
+- Update to 2.21.5.1
+- Fix up BuildRequires
+
+* Thu Dec 06 2007 - Bastien Nocera <bnocera@redhat.com> - 2.21.5-1
+- First package
+
diff --git a/sources b/sources
index e69de29..c574ce6 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+182b833aa1c7111fe907668419859d5f  gnome-settings-daemon-2.21.5.2.tar.bz2