diff --git a/python-cheetah.spec b/python-cheetah.spec
index ea4854f..0189b90 100644
--- a/python-cheetah.spec
+++ b/python-cheetah.spec
@@ -2,7 +2,7 @@
 
 Name:           python-cheetah
 Version:        2.0
-Release:        0.6.rc8%{?dist}
+Release:        0.7.rc8%{?dist}
 Summary:        Template engine and code-generator
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@ License:        MIT
 URL:            http://cheetahtemplate.org/
 Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}rc8.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
@@ -93,6 +93,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/Cheetah-%{version}rc8-*.egg-info/*.txt
 
 %changelog
+* 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