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..f929276
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+txmpp-0.0.2.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 49ef92f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: txmpp
-# $Id$
-NAME := txmpp
-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 $$d/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..da12c10 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+dec646a9113aaada5eb423bfcd0f5a92  txmpp-0.0.2.tar.gz
diff --git a/txmpp.spec b/txmpp.spec
new file mode 100644
index 0000000..9180213
--- /dev/null
+++ b/txmpp.spec
@@ -0,0 +1,70 @@
+Name:             txmpp
+Version:          0.0.2
+Release:          3%{?dist}
+Summary:          A C++ XMPP library
+Group:            System Environment/Libraries
+License:          BSD
+URL:              http://www.tidg.org/txmpp
+Source0:          http://github.com/downloads/tidg/txmpp/%{name}-%{version}.tar.gz
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:    expat-devel >= 2.0.1
+BuildRequires:    openssl-devel
+BuildRequires:    scons
+
+%description
+txmpp is a permissively licensed C++ XMPP library.
+
+%package          devel
+Summary:          Development files for %{name}
+Group:            Development/Libraries
+Requires:         %{name} = %{version}-%{release}
+
+%description      devel
+txmpp is a permissively licensed C++ XMPP library.
+
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%prep
+%setup -q
+
+%build
+scons %{?_smp_mflags} --flags="%{optflags}"
+
+%install
+rm -rf %{buildroot}
+scons %{?_smp_mflags} --flags="%{optflags}" --install \
+  --includedir=%{buildroot}/%{_includedir} \
+  --libdir=%{buildroot}/%{_libdir}
+
+%clean
+rm -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS CHANGELOG LICENSE README.md
+%{_libdir}/*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/txmpp
+%{_libdir}/*.so
+
+%changelog
+* Sun Jul 25 2010 Silas Sewell <silas@sewell.ch> - 0.0.2-3
+- Remove expat2
+
+* Sun Jul 25 2010 Silas Sewell <silas@sewell.ch> - 0.0.2-2
+- Remove documentation from devel package
+- Fix main package group
+
+* Fri Jul 02 2010 Silas Sewell <silas@sewell.ch> - 0.0.2-1
+- Release 0.0.2
+- Include AUTHORS & CHANGELOG
+
+* Tue Jun 15 2010 Silas Sewell <silas@sewell.ch> - 0.0.1-1
+- Initial build