diff --git a/.cvsignore b/.cvsignore
index f130c7d..de4c023 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lxml-1.1.2.tgz
+lxml-2.0.5.tgz
diff --git a/branch b/branch
new file mode 100644
index 0000000..c48525c
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-7
diff --git a/python-lxml.spec b/python-lxml.spec
index acb928e..b00df90 100644
--- a/python-lxml.spec
+++ b/python-lxml.spec
@@ -1,62 +1,86 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?python_version: %define python_version %(%{__python} -c "import sys ; print sys.version[:3]")}
 
-%define srcname lxml
-
-Name:           python-%{srcname}
-Version:        1.1.2
+Name:           python-lxml
+Version:        2.0.5
 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/%{srcname}-%{version}.tgz
+Source0:        http://codespeak.net/lxml/lxml-%{version}.tgz
 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
-Requires:   python-abi = %{python_version}
+BuildRequires:  libxslt-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.  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} -c 'import setuptools; execfile("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} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc README.txt LICENSES.txt PKG-INFO CREDITS.txt CHANGES.txt doc/
-%{python_sitearch}/lxml-%{version}-py%{python_version}.egg-info/
-%dir %{python_sitearch}/lxml
-%{python_sitearch}/lxml/*.so
-%{python_sitearch}/lxml/*.py
-%{python_sitearch}/lxml/*.pyc
-%{python_sitearch}/lxml/*.pyo
+%{python_sitearch}/*
 
 %changelog
+* 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.
+
+* 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
+
 * Fri Jan 19 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.2-1
 - Update to 1.1.2
 
diff --git a/sources b/sources
index 677d420..3e5806b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d18ecaacdecf7c9f02a6e9aecb16c720  lxml-1.1.2.tgz
+2cc8caf84c3b55353d5513c6d668c090  lxml-2.0.5.tgz