diff --git a/.cvsignore b/.cvsignore
index 531984d..9b35909 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lxml-1.3.3.tgz
+lxml-2.0.8.tar.gz
diff --git a/branch b/branch
new file mode 100644
index 0000000..1c26f78
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-9
diff --git a/python-lxml.spec b/python-lxml.spec
index 3a0fbc0..f6af847 100644
--- a/python-lxml.spec
+++ b/python-lxml.spec
@@ -1,19 +1,24 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-lxml
-Version:        1.3.4
+Version:        2.0.8
 Release:        1%{?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/lxml-%{version}.tgz
+Source0:        http://cheeseshop.python.org/packages/source/l/lxml/lxml-%{version}.tar.gz
+#Source0:        http://codespeak.net/lxml/lxml-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
 BuildRequires:  libxslt-devel
-BuildRequires:  python-setuptools-devel
+
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 %description
 lxml provides a Python binding to the libxslt and libxml2 libraries.
@@ -29,11 +34,11 @@ unlike the default bindings.
 chmod a-x doc/rest2html.py
 
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot} --single-version-externally-managed
+%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -44,6 +49,37 @@ rm -rf %{buildroot}
 %{python_sitearch}/*
 
 %changelog
+* Fri Jul 25 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.0.8-1
+- Update to 2.0.8
+
+* Fri Jun 20 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.0.7-1
+- Update to 2.0.7
+- Update download URL
+
+* Sat May 31 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.0.6-1
+- Update to 2.0.6
+
+* Thu May  8 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.0.5-1
+- Update to 2.0.5
+
+* Wed Mar 26 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.0.3-1
+- Update to 2.0.3
+
+* Sat Feb 23 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.0.2-1
+- Update to 2.0.2
+
+* Tue Feb 19 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.0.1-1
+- Update to 2.0.1
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.3.6-2
+- Autorebuild for GCC 4.3
+
+* 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.
 
diff --git a/sources b/sources
index 0346a9b..1de509c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2baa9f8ad14aa6dcfb763cfa0ce3bbcb  lxml-1.3.3.tgz
+f3e7ad6e0e4b66d596e8f301c6943b43  lxml-2.0.8.tar.gz