diff --git a/ypbind.spec b/ypbind.spec
index 2684409..97ee6d2 100644
--- a/ypbind.spec
+++ b/ypbind.spec
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.20.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -16,7 +16,7 @@ Patch5: ypbind-1.19-debuginfo.patch
 Prereq: /sbin/chkconfig
 Requires: rpcbind, yp-tools, bash >= 2.0
 Epoch: 3
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n
 
 BuildRequires: autoconf,automake
 BuildRequires: dbus-glib-devel, docbook-style-xsl
@@ -91,6 +91,9 @@ exit 0
 %doc README NEWS
 
 %changelog
+* Tue Feb 12 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 3:1.20.4-4
+- Fix Buildroot
+
 * Fri Jan 11 2008 Steve Dickson <steved@redhat.com> - 3:1.20.4-3
 - Fixed init script to wait for ypbind to come up. (bz 322101)