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..520c1fd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+PyYAML-3.06.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index df5dee3..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: PyYAML
-# $Id$
-NAME := PyYAML
-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/PyYAML.spec b/PyYAML.spec
new file mode 100644
index 0000000..26b86b0
--- /dev/null
+++ b/PyYAML.spec
@@ -0,0 +1,64 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+Name:           PyYAML
+Version:        3.06
+Release:        1%{?dist}
+Summary:        YAML parser and emitter for Python
+
+Group:          Development/Libraries
+License:        MIT
+URL:            http://pyyaml.org/
+Source0:        http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  python-devel, python-setuptools
+
+%description
+YAML is a data serialization format designed for human readability and
+interaction with scripting languages.  PyYAML is a YAML parser and
+emitter for Python.
+
+PyYAML features a complete YAML 1.1 parser, Unicode support, pickle
+support, capable extension API, and sensible error messages.  PyYAML
+supports standard YAML tags and provides Python-specific tags that allow
+to represent an arbitrary Python object.
+
+PyYAML is applicable for a broad range of tasks from complex
+configuration files to object serialization and persistance.
+
+%prep
+%setup -q -n %{name}-%{version}
+
+
+%build
+%{__python} setup.py build
+chmod a-x examples/yaml-highlight/yaml_hl.py
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc PKG-INFO README LICENSE examples
+%{python_sitelib}/*
+
+
+%changelog
+* Fri Oct 24 2008 John Eckersberg <jeckersb@redhat.com> - 3.06-1
+- New upstream release
+
+* Wed Jan 02 2008 John Eckersberg <jeckersb@redhat.com> - 3.05-2
+- Remove explicit dependency on python >= 2.3
+- Remove executable on example script in docs
+
+* Mon Dec 17 2007 John Eckersberg <jeckersb@redhat.com> - 3.05-1
+- Initial packaging for Fedora
diff --git a/sources b/sources
index e69de29..d97f5d5 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+3d3c92528f1547756c9e1d80d7d905c7  PyYAML-3.06.tar.gz