diff --git a/passwd.spec b/passwd.spec
index e6e25ca..71fdfdb 100644
--- a/passwd.spec
+++ b/passwd.spec
@@ -7,11 +7,11 @@
 Summary: The passwd utility for setting/changing passwords using PAM
 Name: passwd
 Version: 0.74
-Release: 2
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.bz2
-Buildroot: %{_tmppath}/passwd-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pam >= 0.78, /etc/pam.d/system-auth
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Thu Apr  5 2007 Tomas Mraz <tmraz@redhat.com> 0.74-3
+- use std buildroot, add dist tag (#226232)
+
 * Tue Jan 30 2007 Tomas Mraz <tmraz@redhat.com> 0.74-2
 - do not explicitly strip the binary