diff --git a/.cvsignore b/.cvsignore
index d742abd..bba1153 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Cheetah-1.0.tar.gz
+Cheetah-2.0rc6.tar.gz
diff --git a/python-cheetah.spec b/python-cheetah.spec
index 142c9c0..f4abb3c 100644
--- a/python-cheetah.spec
+++ b/python-cheetah.spec
@@ -1,38 +1,46 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True)")}
 
 Name:           python-cheetah
-Version:        1.0
-Release:        2%{?dist}
+Version:        2.0
+Release:        0.rc6.0%{?dist}
 Summary:        Template engine and code-generator
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://sourceforge.net/projects/cheetahtemplate
-Source0:        http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}.tar.gz
+Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}rc6.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python
 BuildRequires:  python-devel
 
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
-Cheetah is a Python-powered template engine and code-generator.
-It is similar to the Jakarta project's Velocity.
+Cheetah is an open source template engine and code generation tool,
+written in Python. It can be used standalone or combined with other
+tools and frameworks. Web development is its principle use, but
+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}
+%setup -q -n Cheetah-%{version}rc6
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+export CFLAGS="$RPM_OPT_FLAGS"
+%{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --root %{buildroot}
+
+%check
+export PATH="%{buildroot}/%{_bindir}:$PATH"
+export PYTHONPATH="%{buildroot}/%{python_sitelib}"
+%{__python} %{buildroot}/%{python_sitelib}/Cheetah/Tests/Test.py
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -47,6 +55,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/Cheetah/_namemapper.so
 %ghost %{python_sitelib}/Cheetah/*.pyo
 
+%dir %{python_sitelib}/Cheetah/Macros
+%{python_sitelib}/Cheetah/Macros/*.py
+%{python_sitelib}/Cheetah/Macros/*.pyc
+%ghost %{python_sitelib}/Cheetah/Macros/*.pyo
+
 %dir %{python_sitelib}/Cheetah/Templates
 %{python_sitelib}/Cheetah/Templates/*.py
 %{python_sitelib}/Cheetah/Templates/*.pyc
@@ -75,6 +88,10 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %{python_sitelib}/Cheetah/Utils/optik/*.pyo
 
 %changelog
+* Sun May 21 2006 Mike Bonnet <mikeb@redhat.com> - 2.0-0.rc6.0
+- update to 2.0rc6
+- run the included test suite after install
+
 * Thu Feb 16 2006 Mike Bonnet <mikeb@redhat.com> - 1.0-2
 - Rebuild for Fedora Extras 5
 
diff --git a/sources b/sources
index f899792..a09348e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aaa4907b8877093b9bb11e6cea6b029b  Cheetah-1.0.tar.gz
+61d82da0977b706b2e1f34317de58d7d  Cheetah-2.0rc6.tar.gz