diff --git a/.cvsignore b/.cvsignore
index bd0e924..590b034 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Cheetah-2.0rc8.tar.gz
+Cheetah-2.0.1.tar.gz
diff --git a/python-cheetah.spec b/python-cheetah.spec
index ea4854f..46b7e14 100644
--- a/python-cheetah.spec
+++ b/python-cheetah.spec
@@ -1,19 +1,19 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True)")}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-cheetah
-Version:        2.0
-Release:        0.6.rc8%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        Template engine and code-generator
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://cheetahtemplate.org/
-Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}rc8.tar.gz
+Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}.tar.gz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools
+BuildRequires:  python-setuptools-devel
 
 %description
 Cheetah is an open source template engine and code generation tool,
@@ -23,22 +23,21 @@ 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}rc8
+%setup -q -n Cheetah-%{version}
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
 export CHEETAH_USE_SETUPTOOLS=1
 %{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
 export CHEETAH_USE_SETUPTOOLS=1
-%{__python} setup.py install --single-version-externally-managed -O1 --skip-build --root %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 %check
 export PATH="%{buildroot}/%{_bindir}:$PATH"
-export PYTHONPATH="%{buildroot}/%{python_sitelib}"
-%{__python} %{buildroot}/%{python_sitelib}/Cheetah/Tests/Test.py
+export PYTHONPATH="%{buildroot}/%{python_sitearch}"
+%{__python} %{buildroot}/%{python_sitearch}/Cheetah/Tests/Test.py
 
 %clean
 rm -rf %{buildroot}
@@ -50,49 +49,58 @@ rm -rf %{buildroot}
 %{_bindir}/cheetah
 %{_bindir}/cheetah-compile
 
-%dir %{python_sitelib}/Cheetah
-%{python_sitelib}/Cheetah/*.py
-%{python_sitelib}/Cheetah/*.pyc
-%{python_sitelib}/Cheetah/_namemapper.so
-%{python_sitelib}/Cheetah/*.pyo
-
-%dir %{python_sitelib}/Cheetah/Macros
-%{python_sitelib}/Cheetah/Macros/*.py
-%{python_sitelib}/Cheetah/Macros/*.pyc
-%{python_sitelib}/Cheetah/Macros/*.pyo
-
-%dir %{python_sitelib}/Cheetah/Templates
-%{python_sitelib}/Cheetah/Templates/*.py
-%{python_sitelib}/Cheetah/Templates/*.pyc
-%{python_sitelib}/Cheetah/Templates/*.tmpl
-%{python_sitelib}/Cheetah/Templates/*.pyo
-
-%dir %{python_sitelib}/Cheetah/Tests
-%{python_sitelib}/Cheetah/Tests/*.py
-%{python_sitelib}/Cheetah/Tests/*.pyc
-%{python_sitelib}/Cheetah/Tests/*.pyo
-
-%dir %{python_sitelib}/Cheetah/Tools
-%{python_sitelib}/Cheetah/Tools/*.py
-%{python_sitelib}/Cheetah/Tools/*.pyc
-%{python_sitelib}/Cheetah/Tools/*.txt
-%{python_sitelib}/Cheetah/Tools/*.pyo
-
-%dir %{python_sitelib}/Cheetah/Utils
-%{python_sitelib}/Cheetah/Utils/*.py
-%{python_sitelib}/Cheetah/Utils/*.pyc
-%{python_sitelib}/Cheetah/Utils/*.pyo
-
-%dir %{python_sitelib}/Cheetah/Utils/optik
-%{python_sitelib}/Cheetah/Utils/optik/*.py
-%{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
+%dir %{python_sitearch}/Cheetah
+%{python_sitearch}/Cheetah/*.py
+%{python_sitearch}/Cheetah/*.pyc
+%{python_sitearch}/Cheetah/_namemapper.so
+%{python_sitearch}/Cheetah/*.pyo
+
+%dir %{python_sitearch}/Cheetah/Macros
+%{python_sitearch}/Cheetah/Macros/*.py
+%{python_sitearch}/Cheetah/Macros/*.pyc
+%{python_sitearch}/Cheetah/Macros/*.pyo
+
+%dir %{python_sitearch}/Cheetah/Templates
+%{python_sitearch}/Cheetah/Templates/*.py
+%{python_sitearch}/Cheetah/Templates/*.pyc
+%{python_sitearch}/Cheetah/Templates/*.tmpl
+%{python_sitearch}/Cheetah/Templates/*.pyo
+
+%dir %{python_sitearch}/Cheetah/Tests
+%{python_sitearch}/Cheetah/Tests/*.py
+%{python_sitearch}/Cheetah/Tests/*.pyc
+%{python_sitearch}/Cheetah/Tests/*.pyo
+
+%dir %{python_sitearch}/Cheetah/Tools
+%{python_sitearch}/Cheetah/Tools/*.py
+%{python_sitearch}/Cheetah/Tools/*.pyc
+%{python_sitearch}/Cheetah/Tools/*.txt
+%{python_sitearch}/Cheetah/Tools/*.pyo
+
+%dir %{python_sitearch}/Cheetah/Utils
+%{python_sitearch}/Cheetah/Utils/*.py
+%{python_sitearch}/Cheetah/Utils/*.pyc
+%{python_sitearch}/Cheetah/Utils/*.pyo
+
+%dir %{python_sitearch}/Cheetah/Utils/optik
+%{python_sitearch}/Cheetah/Utils/optik/*.py
+%{python_sitearch}/Cheetah/Utils/optik/*.pyc
+%{python_sitearch}/Cheetah/Utils/optik/*.pyo
+
+%dir %{python_sitearch}/Cheetah-%{version}-*.egg-info
+%{python_sitearch}/Cheetah-%{version}-*.egg-info/PKG-INFO
+%{python_sitearch}/Cheetah-%{version}-*.egg-info/*.txt
 
 %changelog
+* Tue Jan 22 2008 Mike Bonnet <mikeb@redhat.com> - 2.0.1-1
+- update to the 2.0.1 release
+
+* Mon Oct 15 2007 Mike Bonnet <mikeb@redhat.com> - 2.0-1
+- update to the 2.0 release
+
+* Tue Aug 21 2007 Mike Bonnet <mikeb@redhat.com> - 2.0-0.7.rc8
+- rebuild for F8
+
 * Thu May  3 2007 Mike Bonnet <mikeb@redhat.com> - 2.0-0.6.rc8
 - bump release for rebuild
 
diff --git a/sources b/sources
index 24c4c6f..5f031c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7a13092bad898ba0b0fe903865fc1faa  Cheetah-2.0rc8.tar.gz
+7845a2950ea850a13c488a26b61ac50a  Cheetah-2.0.1.tar.gz