diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 531984d..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-lxml-1.3.3.tgz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6803f34
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+lxml-1.3.6.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2282443..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: python-lxml
-# $Id$
-NAME := python-lxml
-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/python-lxml.spec b/python-lxml.spec
index 9a95ed8..af5e8fa 100644
--- a/python-lxml.spec
+++ b/python-lxml.spec
@@ -1,48 +1,42 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define srcname lxml
-
-Name:           python-%{srcname}
-Version:        1.3.3
-Release:        1%{?dist}
+Name:           python-lxml
+Version:        1.3.6
+Release:        2%{?dist}
 Summary:        ElementTree-like Python bindings for libxml2 and libxslt
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://codespeak.net/lxml/
-Source0:        http://codespeak.net/lxml/%{srcname}-%{version}.tgz
+Source0:        http://cheeseshop.python.org/packages/source/l/lxml/lxml-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel libxslt-devel python-setuptools
-# Upstream now includes the generated .c file and the Pyrex shipped
-# with FC (0.9.3.1) is broken for gcc >= 4.0
-#BuildRequires: Pyrex >= 0.9.4
+BuildRequires:  python-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  python-setuptools
 
 %description
-lxml provides a Python binding to the libxslt and libxml2 libraries.  It
-follows the ElementTree API as much as possible in order to provide a more
-Pythonic interface to libxml2 and libxslt than the default bindings.  In
-particular, lxml deals with Python Unicode strings rather than encoded UTF-8
-and handles memory management automatically, unlike the default bindings.
-
+lxml provides a Python binding to the libxslt and libxml2 libraries.
+It follows the ElementTree API as much as possible in order to provide
+a more Pythonic interface to libxml2 and libxslt than the default
+bindings.  In particular, lxml deals with Python Unicode strings
+rather than encoded UTF-8 and handles memory management automatically,
+unlike the default bindings.
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n lxml-%{version}
 
 chmod a-x doc/rest2html.py
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-
+CFLAGS="%{optflags}" %{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed
-
+rm -rf %{buildroot}
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -50,6 +44,24 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Fri Jul 25 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.3.6-2
+- Revert CVS back to a version of lxml that actually builds on EL-4.
+
+* Mon Nov  4 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.3.6-1
+- Update to 1.3.6.
+
+* Mon Oct 22 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.3.5-1
+- Update to 1.3.5.
+
+* Thu Aug 30 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.3.4-1
+- Update to 1.3.4.
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.3.3-3
+- Rebuild for selinux ppc32 issue.
+
+* Tue Aug 28 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.3.3-2
+- BR python-setuptools-devel
+
 * Mon Jul 30 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.3.3-1
 - Update to 1.3.3
 
diff --git a/sources b/sources
index 0346a9b..180a451 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2baa9f8ad14aa6dcfb763cfa0ce3bbcb  lxml-1.3.3.tgz
+a66f3b9669ee4fd2f98b6be920ac583c  lxml-1.3.6.tar.gz