diff --git a/bridge-utils.spec b/bridge-utils.spec
index a3e1dac..d9298c3 100644
--- a/bridge-utils.spec
+++ b/bridge-utils.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for configuring the linux ethernet bridge
 Name: bridge-utils
 Version: 1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://bridge.sourceforge.net/
 Group: System Environment/Base
@@ -9,7 +9,7 @@ Source: http://dl.sf.net/bridge/bridge-utils-%{version}.tar.gz
 Patch0: bridge-utils-1.0.4-inc.patch
 Patch1: bridge-utils-1.2-show-ports.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libsysfs-devel autoconf
 BuildRequires: kernel-headers >= 2.6.16
 
@@ -23,7 +23,7 @@ ethernet devices directly.
 Install bridge-utils if you want to use the linux ethernet bridge.
 
 %prep
-%setup
+%setup -q
 
 %patch0 -p1
 %patch1 -p1
@@ -34,6 +34,7 @@ autoconf
 make
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} SUBDIRS="brctl doc" install
 
 %clean
@@ -46,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/brctl.8*
 
 %changelog
+* Mon Dec 10 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 1.2-3
+- Minor tweaks as recommended in merge review (BZ#225625)
+
 * Wed Aug 22 2007 David Woodhouse <dwmw2@redhat.com> 1.2-2
 - Update licence