diff --git a/exim-doc.spec b/exim-doc.spec
index c97849a..e5104c6 100644
--- a/exim-doc.spec
+++ b/exim-doc.spec
@@ -1,11 +1,11 @@
 Summary: Documentation for the exim mail transfer agent
 Name: exim-doc
 Version: 4.63
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: Documentation
-Buildroot: %{_tmppath}/%{name}-build.root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source1: ftp://ftp.exim.org/pub/exim/exim4/FAQ-html-20050415.tar.bz2
 Source2: ftp://ftp.exim.org/pub/exim/exim4/exim-html-%{version}.tar.bz2
 Source3: ftp://ftp.exim.org/pub/exim/exim4/exim-postscript-%{version}.tar.bz2
@@ -21,7 +21,6 @@ package contains the documentation for Exim, also available on the
 web at http://www.exim.org/
 
 %prep
-cd $RPM_BUILD_DIR
 rm -rf %{name}-%{version}
 mkdir %{name}-%{version}
 %setup -q -T -D -a 1
@@ -37,6 +36,8 @@ mv exim-pdf-*/ pdf
 mv exim-texinfo-*/ texinfo
 %setup -q -T -D -a 6
 
+find . -name CVS -type d | xargs rm -rf 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -45,9 +46,17 @@ rm -rf $RPM_BUILD_ROOT
 %doc faq html ps pdf texinfo config.samples
 
 %changelog
+* Sun Sep  3 2006 David Woodhouse <dwmw2@redhat.com> 4.63-2
+- Merge twoerner's 4.62-3.el5 changes into Extras package
+
 * Sun Sep  3 2006 David Woodhouse <dwmw2@redhat.com> 4.63-1
 - Update to 4.63
 
+* Mon Jul 17 2006 Thomas Woerner <twoerner@redhat.com> 4.62-3.el5
+- fixed buildroot for package review
+- dropped CVS from config.samples
+- fixed permissions of spec and tar files
+
 * Tue May  2 2006 David Woodhouse <dwmw2@redhat.com> 4.62-2
 - Bump release to work around the fact that 'make tag' _still_ doesn't
   make sure that the common directory is up to date, just like it didn't