diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c225060
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xsettings-kde-0.6.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 1513d4d..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xsettings-kde
-# $Id$
-NAME := xsettings-kde
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/sources b/sources
index e69de29..8318c10 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+4a34e5ed61eb8a4d93603d4af0732b72  xsettings-kde-0.6.tar.bz2
diff --git a/xsettings-kde.desktop b/xsettings-kde.desktop
new file mode 100644
index 0000000..791064a
--- /dev/null
+++ b/xsettings-kde.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=xsettings-kde
+Name=XSettings-KDE
+X-KDE-autostart-after=kdesktop
+Type=Service
+
diff --git a/xsettings-kde.spec b/xsettings-kde.spec
new file mode 100644
index 0000000..4ef1fde
--- /dev/null
+++ b/xsettings-kde.spec
@@ -0,0 +1,95 @@
+
+Summary: XSettings Daemon for KDE
+Name:    xsettings-kde
+Version: 0.6
+Release: 3%{?dist}	
+License: GPLv2+
+Group:   User Interface/Desktops 
+# upstream is a svn; please use 
+# the following command to download the sources
+# svn co http://svn.mandriva.com/svn/soft/theme/xsettings-kde/trunk/
+# the tar.bz2 included in this src.rpm is based on revision 233477.
+Source0:  %{name}-%{version}.tar.bz2
+URL: http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/theme/xsettings-kde/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source1: xsettings-kde.desktop
+
+BuildRequires: libX11-devel
+
+%description
+This package provides a XSettings daemon for KDE Desktop Environment.
+It allows XSettings aware applications (all GTK+ 2 and GNOME 2 applications)
+to be informed instantly of changes in KDE configuration, such as theme name,
+default font and so on.
+
+
+%prep
+%setup -q
+
+
+%build
+
+make CFLAGS="%{optflags}" %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+
+install -p -m755 -D  xsettings-kde %{buildroot}%{_bindir}/xsettings-kde
+
+install -p -m644 -D %{SOURCE1} \
+  %{buildroot}%{_datadir}/autostart/xsettings-kde.desktop
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files 
+%defattr(-,root,root,-)
+%doc ChangeLog README COPYING
+%{_bindir}/*
+%{_datadir}/autostart/*
+
+
+%changelog
+* Sun Jan 27 2008 Manuel Wolfshant <wolfy@fedoraproject.org> 0.6-3
+- small fixes
+
+* Sun Dec 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.6-2
+- fedora-ize
+
+* Wed Sep 26 2007 Frederic Crozat <fcrozat@mandriva.com> 0.6-1mdv2008.0
++ Revision: 93073
+- Release 0.6 :
+ -failover correctly when some configuration files aren't present
+
+* Fri Sep 21 2007 Frederic Crozat <fcrozat@mandriva.com> 0.5-1mdv2008.0
++ Revision: 91946
+- Release 0.5
+ - handle multiple kde profiles specified as prefixes
+
+* Fri Aug 31 2007 Adam Williamson <awilliamson@mandriva.com> 0.4-2mdv2008.0
++ Revision: 76611
+- rebuild for 2008
+- don't package COPYING
+- Import xsettings-kde
+
+* Wed Sep 13 2006 Frederic Crozat <fcrozat@mandriva.com> 0.4-1mdv2007.0
+- Release 0.4 :
+ * change theme according to color scheme for Ia Ora (Mdv bug #25574)
+ * fix theme detection
+ * support kde profile
+ * don't change theme if ~/.gtkrc-2.0 exists
+
+* Mon Mar 06 2006 Frederic Crozat <fcrozat@mandriva.com> 0.3-1mdk
+- Release 0.3 :
+ - support Net/FallbackIconTheme, fix Mdk bug #19441)
+
+* Thu Aug 25 2005 Frederic Crozat <fcrozat@mandriva.com> 0.2-1mdk 
+- Release 0.2 :
+ - force gnome-vfs gtk2 file selector backend
+
+* Wed Jul 27 2005 Frederic Crozat <fcrozat@mandriva.com> 0.1-1mdk 
+- Initial package