diff --git a/yp-tools.spec b/yp-tools.spec
index ae4e9d6..f07c5f6 100644
--- a/yp-tools.spec
+++ b/yp-tools.spec
@@ -1,7 +1,7 @@
 Summary: NIS (or YP) client programs.
 Name: yp-tools
 Version: 2.9
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
@@ -9,7 +9,7 @@ Url: http://www.linux-nis.org/nis/yp-tools/index.html
 Patch1: yp-tools-2.7-md5.patch
 Obsoletes: yppasswd, yp-clients
 Requires: ypbind
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The Network Information Service (NIS) is a system which provides
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/yp
 
 %changelog
+* Mon Feb 11 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.9-3
+- Fix Buildroot
+
 * Tue Jul 31 2007 Steve Dickson <steved@redhat.com> 2.9-1
 - Changed install process to create an useful debuginfo package (bz 249961)