diff --git a/python-cheetah.spec b/python-cheetah.spec
index 958155d..ea4854f 100644
--- a/python-cheetah.spec
+++ b/python-cheetah.spec
@@ -2,19 +2,18 @@
 
 Name:           python-cheetah
 Version:        2.0
-Release:        0.2.rc7%{?dist}
+Release:        0.6.rc8%{?dist}
 Summary:        Template engine and code-generator
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://cheetahtemplate.org/
-Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}rc7.tar.gz
+Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}rc8.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
-
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+BuildRequires:  python-setuptools
 
 %description
 Cheetah is an open source template engine and code generation tool,
@@ -24,15 +23,17 @@ Cheetah is very flexible and is also being used to generate C++ game
 code, Java, sql, form emails and even Python code.
 
 %prep
-%setup -q -n Cheetah-%{version}rc7
+%setup -q -n Cheetah-%{version}rc8
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
+export CHEETAH_USE_SETUPTOOLS=1
 %{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --root %{buildroot}
+export CHEETAH_USE_SETUPTOOLS=1
+%{__python} setup.py install --single-version-externally-managed -O1 --skip-build --root %{buildroot}
 
 %check
 export PATH="%{buildroot}/%{_bindir}:$PATH"
@@ -87,7 +88,24 @@ rm -rf %{buildroot}
 %{python_sitelib}/Cheetah/Utils/optik/*.pyc
 %{python_sitelib}/Cheetah/Utils/optik/*.pyo
 
+%dir %{python_sitelib}/Cheetah-%{version}rc8-*.egg-info
+%{python_sitelib}/Cheetah-%{version}rc8-*.egg-info/PKG-INFO
+%{python_sitelib}/Cheetah-%{version}rc8-*.egg-info/*.txt
+
 %changelog
+* Thu May  3 2007 Mike Bonnet <mikeb@redhat.com> - 2.0-0.6.rc8
+- bump release for rebuild
+
+* Mon Apr 23 2007 Mike Bonnet <mikeb@redhat.com> - 2.0-0.5.rc8
+- update to 2.0rc8
+
+* Mon Jan  8 2007 Mike Bonnet <mikeb@redhat.com> - 2.0-0.4.rc7
+- use setuptools and install setuptools metadata
+
+* Sun Dec 10 2006 Mike Bonnet <mikeb@redhat.com> - 2.0-0.3.rc7
+- rebuild against python 2.5
+- remove obsolete python-abi Requires:
+
 * Mon Sep 11 2006 Mike Bonnet <mikeb@redhat.com> - 2.0-0.2.rc7
 - un-%%ghost .pyo files
 
diff --git a/sources b/sources
index fad0c1d..24c4c6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-94f83679cf4ebd658143faa339bbf134  Cheetah-2.0rc7.tar.gz
+7a13092bad898ba0b0fe903865fc1faa  Cheetah-2.0rc8.tar.gz