diff --git a/fetchmail.spec b/fetchmail.spec
index 4cb8a3a..5f7ecfd 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -4,7 +4,7 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
@@ -14,7 +14,7 @@ URL: http://fetchmail.berlios.de/
 # For a breakdown of the licensing, see COPYING
 License: GPL+ and Public Domain
 Group: Applications/Internet
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel hesiod-devel krb5-devel openssl-devel
 %if ! %{fetchmailconf}
 Obsoletes: fetchmailconf
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Feb 11 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.3.8-5
+- Fix Buildroot
+
 * Wed Dec  5 2007 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.3.8-4
 - Rebuild