diff --git a/.cvsignore b/.cvsignore
index 1672160..f5d0548 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bridge-utils-0.9.6.tar.gz
+bridge-utils-1.0.4.tar.gz
diff --git a/bridge-utils-1.0.4-inc.patch b/bridge-utils-1.0.4-inc.patch
new file mode 100644
index 0000000..1ae3f5b
--- /dev/null
+++ b/bridge-utils-1.0.4-inc.patch
@@ -0,0 +1,10 @@
+--- bridge-utils-1.0.4/libbridge/libbridge_private.h~	2004-05-28 21:38:38.000000000 +0100
++++ bridge-utils-1.0.4/libbridge/libbridge_private.h	2004-07-01 11:24:21.000000000 +0100
+@@ -22,6 +22,7 @@
+ #include "config.h"
+ 
+ #include <linux/sockios.h>
++#include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <linux/if_bridge.h>
diff --git a/bridge-utils.spec b/bridge-utils.spec
index 8e96d96..9056062 100644
--- a/bridge-utils.spec
+++ b/bridge-utils.spec
@@ -1,12 +1,12 @@
 Summary: Utilities for configuring the linux ethernet bridge.
 Name: bridge-utils
-Version: 0.9.6
-Release: 4
+Version: 1.0.4
+Release: 2
 Copyright: GPL
+URL: http://bridge.sourceforge.net/
 Group: System Environment/Base
 Source0: http://bridge.sourceforge.net/bridge-utils/bridge-utils-%{PACKAGE_VERSION}.tar.gz
-Patch0: bridge-utils-0.9.6-retcode.patch
-Patch1: bridge-utils-0.9.6-inc.patch
+Patch0: bridge-utils-1.0.4-inc.patch
 BuildRoot: /var/tmp/%{name}-%{version}-root
 
 %description
@@ -34,26 +34,17 @@ Install bridge-utils-devel if you are going to develop programs which
 will use the linux ethernet bridge interface library.
 
 %prep
-%setup -n bridge-utils
+%setup
+
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
 make
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
-install -m 0755 brctl/brctl ${RPM_BUILD_ROOT}/%{_sbindir}
-gzip doc/brctl.8
-install -m 0644  doc/brctl.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8
-install -m 0644 libbridge/libbridge.h ${RPM_BUILD_ROOT}%{_includedir}
-install -m 0644 libbridge/libbridge.a ${RPM_BUILD_ROOT}%{_libdir}/
+make DESTDIR=${RPM_BUILD_ROOT} install
+#gzip ${RPM_BUILD_ROOT}/%{_mandir}/man8/brctl.8
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -62,7 +53,7 @@ install -m 0644 libbridge/libbridge.a ${RPM_BUILD_ROOT}%{_libdir}/
 %defattr (-,root,root)
 %doc AUTHORS COPYING doc/FAQ doc/HOWTO doc/RPM-GPG-KEY
 %{_sbindir}/brctl
-%{_mandir}/man8/brctl.8.gz
+%{_mandir}/man8
 
 %files -n bridge-utils-devel
 %defattr (-,root,root)
@@ -70,6 +61,9 @@ install -m 0644 libbridge/libbridge.a ${RPM_BUILD_ROOT}%{_libdir}/
 %{_libdir}/libbridge.a
 
 %changelog
+* Thu Jul 1 2004 David Woodhouse <dwmw2@redhat.com>
+- Update to 1.0.4
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index 4a27d90..e386c5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c45ede7ebd2fa762b4093f62ff582fd0  bridge-utils-0.9.6.tar.gz
+2cab42847c4654e58c4d0ba114bfe2c2  bridge-utils-1.0.4.tar.gz