diff --git a/.cvsignore b/.cvsignore
index bba1153..cc2395e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Cheetah-2.0rc6.tar.gz
+Cheetah-2.0rc7.tar.gz
diff --git a/python-cheetah.spec b/python-cheetah.spec
index f4abb3c..b589683 100644
--- a/python-cheetah.spec
+++ b/python-cheetah.spec
@@ -2,13 +2,13 @@
 
 Name:           python-cheetah
 Version:        2.0
-Release:        0.rc6.0%{?dist}
+Release:        0.1.rc7%{?dist}
 Summary:        Template engine and code-generator
 
 Group:          Development/Libraries
 License:        MIT
-URL:            http://sourceforge.net/projects/cheetahtemplate
-Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}rc6.tar.gz
+URL:            http://cheetahtemplate.org/
+Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}rc7.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,7 +24,7 @@ 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}rc6
+%setup -q -n Cheetah-%{version}rc7
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -88,6 +88,10 @@ rm -rf %{buildroot}
 %ghost %{python_sitelib}/Cheetah/Utils/optik/*.pyo
 
 %changelog
+* Thu Jul 13 2006 Mike Bonnet <mikeb@redhat.com> - 2.0-0.1.rc7
+- update to 2.0rc7
+- change %%release format to conform to Extras packaging guidelines
+
 * 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
diff --git a/sources b/sources
index a09348e..fad0c1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61d82da0977b706b2e1f34317de58d7d  Cheetah-2.0rc6.tar.gz
+94f83679cf4ebd658143faa339bbf134  Cheetah-2.0rc7.tar.gz