diff --git a/libidn.spec b/libidn.spec
index 114bc74..c51bfd4 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -6,7 +6,7 @@ URL: http://www.gnu.org/software/libidn/
 License: LGPLv2+
 Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig, gettext, libtool, autoconf
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -102,6 +102,7 @@ rm -rf %{buildroot}
 * Thu Feb  7 2008 Joe Orton <jorton@redhat.com> 0.6.14-5
 - fix DT_RPATH in /usr/bin/idn
 - convert libidn.iconv to UTF-8 (Jon Ciesla, #226029)
+- fix BuildRoot tag (Jon Ciesla, #226029)
 
 * Tue Aug 21 2007 Joe Orton <jorton@redhat.com> 0.6.14-4
 - drop contrib directory from docs