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..cca8510
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xesam-tools-0.6.1.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index f8e0002..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xesam-tools
-# $Id$
-NAME := xesam-tools
-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..9e73eef 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+00f2b2b0ed3f5336115a0c029eb1cd38  xesam-tools-0.6.1.tar.gz
diff --git a/xesam-tools.spec b/xesam-tools.spec
new file mode 100644
index 0000000..166692d
--- /dev/null
+++ b/xesam-tools.spec
@@ -0,0 +1,54 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+Summary:	A toolkit for Xesam compliant services
+Name:		xesam-tools
+Version:	0.6.1
+Release:	1%{?dist}
+License:	LGPLv2
+Group:		Applications/System
+URL:		http://xesam.org/main
+Source0:	http://xesam.org/people/kamstrup/%{name}/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	python-devel
+
+BuildArch:	noarch
+
+%description
+xesam-tools provides Python packages to interface with Xesam
+compliant services as well as a command line tool to use directly.
+
+It also features a framework for easily implementing xesam compliant
+servers via the xesam.server package. There are two examples bundled
+with this distribution. Namely demo/xesam-yahoo-service and
+demo/xesam-dummy-service. Both include a small header describing
+their usage.
+
+The implementation uses gobject and the Python dbus bindings for the gobject
+mainloop. There's no gui, only a command line application (xesam-tool).
+
+%prep
+%setup -q
+
+%build
+%{__python} setup.py build
+
+%install
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+
+chmod 0644 demo/xesam-yahoo-service demo/xesam-dummy-service
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-, root, root, -)
+%doc AUTHORS ChangeLog COPYING README
+%doc demo/xesam-yahoo-service demo/xesam-dummy-service
+%{_bindir}/xesam-tool
+%{python_sitelib}/xesam/
+%{python_sitelib}/xesam*.egg-info
+
+%changelog
+* Mon May 12 2008 Deji Akingunola <dakingun@gmail.com> - 0.6.1-1
+- Initial packaging for Fedora.