diff --git a/.cvsignore b/.cvsignore
index f5d0548..cc0654a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bridge-utils-1.0.4.tar.gz
+bridge-utils-1.0.6.tar.gz
diff --git a/bridge-utils.spec b/bridge-utils.spec
index 9024f6e..78ea8d4 100644
--- a/bridge-utils.spec
+++ b/bridge-utils.spec
@@ -1,14 +1,14 @@
-Summary: Utilities for configuring the linux ethernet bridge.
+Summary: Utilities for configuring the linux ethernet bridge
 Name: bridge-utils
-Version: 1.0.4
-Release: 6.1
+Version: 1.0.6
+Release: 1
 License: GPL
 URL: http://bridge.sourceforge.net/
 Group: System Environment/Base
-Source0: http://bridge.sourceforge.net/bridge-utils/bridge-utils-%{PACKAGE_VERSION}.tar.gz
+Source: http://dl.sf.net/bridge/bridge-utils-%{version}.tar.gz
 Patch0: bridge-utils-1.0.4-inc.patch
 Patch1: bridge-utils-1.0.4-kernheaders.patch
-BuildRoot: /var/tmp/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: sysfsutils-devel
 
 %description
@@ -20,11 +20,11 @@ ethernet devices directly.
 
 Install bridge-utils if you want to use the linux ethernet bridge.
 
-%package -n bridge-utils-devel
-Summary: Utilities for configuring the linux ethernet bridge.
+%package devel
+Summary: Utilities for configuring the linux ethernet bridge
 Group: Development/Libraries
 
-%description -n bridge-utils-devel
+%description devel
 The bridge-utils-devel package contains the header and object files
 necessary for developing programs which use 'libbridge.a', the
 interface to the linux kernel ethernet bridge. If you are developing
@@ -47,23 +47,26 @@ make
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
-#gzip ${RPM_BUILD_ROOT}/%{_mandir}/man8/brctl.8
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr (-,root,root)
-%doc AUTHORS COPYING doc/FAQ doc/HOWTO doc/RPM-GPG-KEY
+%defattr (-,root,root,0755)
+%doc AUTHORS COPYING doc/FAQ doc/HOWTO
 %{_sbindir}/brctl
-%{_mandir}/man8
+%{_mandir}/man8/brctl.8*
 
-%files -n bridge-utils-devel
-%defattr (-,root,root)
+%files devel
+%defattr (-,root,root,0755)
 %{_includedir}/libbridge.h
 %{_libdir}/libbridge.a
 
 %changelog
+* Wed Dec 21 2005 David Woodhouse <dwmw2@redhat.com> 1.0.6-1
+- Update to 1.0.6
+- Cleanups from Matthias Saou (#172774)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index e386c5e..36d2a5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2cab42847c4654e58c4d0ba114bfe2c2  bridge-utils-1.0.4.tar.gz
+9b7dc52656f5cbec846a7ba3299f73bd  bridge-utils-1.0.6.tar.gz