diff --git a/.cvsignore b/.cvsignore
index 834a8c1..c92551d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-iproute2-2.4.7-now-ss020116-try.tar.gz
+iproute2-2.6.9-ss040831.tar.gz
diff --git a/iproute.spec b/iproute.spec
index f0db2ba..6a6d7fb 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,9 +1,9 @@
 Summary: Advanced IP routing and network device configuration tools.
 Name: iproute
-Version: 2.4.7
-Release: 17
+Version: 2.6.9
+Release: 1
 Group: Applications/System
-Source: http://ftp.sunet.se/pub/os/Linux/ip-routing/iproute2-2.4.7-now-ss020116-try.tar.gz
+Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}-ss040831.tar.gz
 Source1: ip.8
 Source2: tc.8
 Source3: tc-cbq.8
@@ -16,21 +16,12 @@ Source9: tc-red.8
 Source10: tc-sfq.8
 Source11: tc-tbf.8
 Patch0: iproute2-2.4.7-docmake.patch
-Patch1: iproute2-2.4.7-misc.patch
-Patch2: iproute2-2.4.7-rt_config.patch
-Patch4:	iproute2-2.4.7-in_port_t.patch
-Patch5: iproute2-2.4.7-kernel.patch
-Patch6: iproute2-2.4.7-hex.patch
-Patch7: iproute2-2.4.7-config.patch
-Patch8: iproute2-2.4.7-htb3-tc.patch
-Patch9: iproute2-2.4.7-ss.patch
-Patch10: iproute2-2.4.7-db.patch
-Patch11: iproute2-2.4.7-netlink.patch
-Patch12: iproute2-2.4.7-optarg.patch
-Patch13: iproute2-2.4.7-initvar.patch
-Patch14: iproute2-2.4.7-default.patch
+Patch1: iproute2-2.4.7-rt_config.patch
+Patch2: iproute2-2.6.9-kernel.patch
+Patch3: iproute2-2.6.9-ss.patch
+Patch4: iproute2-2.4.7-initvar.patch
 License: GNU GPL
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison
 
 %description
@@ -39,21 +30,12 @@ example) which are designed to use the advanced networking
 capabilities of the Linux 2.4.x and 2.6.x kernel.
 
 %prep
-%setup -q -n iproute2
+%setup -q -n iproute2-2.6.9
 %patch0 -p1 -b .docmake
-%patch1 -p1 -b .misc
-%patch2 -p1 -b .rt_config
-%patch4 -p1 -b .glibc22
-%patch5 -p1 -b .kernel
-%patch6 -p1 -b .hex
-%patch7 -p1 -b .config
-%patch8 -p1 -b .htb3-tc
-%patch9 -p1 -b .ss
-%patch10 -p1 -b .db
-%patch11 -p1 -b .netlink
-%patch12 -p1 -b .optarg
-%patch13 -p1 -b .initvar
-%patch14 -p1 -b .default
+%patch1 -p1 -b .rt_config
+%patch2 -p1 -b .kernel
+%patch3 -p1 -b .ss
+%patch4 -p1 -b .initvar
 
 %build
 make
@@ -97,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/*
 
 %changelog
+* Wed Sep 01 2004 Radek Vokal <rvokal@redhat.com> 2.6.9-1
+- updated to iproute-2.6.9, spec file change, patches cleared
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/iproute2-2.6.9-kernel.patch b/iproute2-2.6.9-kernel.patch
new file mode 100644
index 0000000..a3e828a
--- /dev/null
+++ b/iproute2-2.6.9-kernel.patch
@@ -0,0 +1,10 @@
+--- iproute2-2.6.9/Makefile.kernel	2004-09-01 12:42:33.000000000 +0200
++++ iproute2-2.6.9/Makefile	2004-09-01 12:48:19.076463088 +0200
+@@ -3,6 +3,7 @@
+ CONFDIR=/etc/iproute2
+ DOCDIR=/usr/doc/iproute2
+ MANDIR=/usr/share/man
++KERNEL_INCLUDE=/usr/include
+ 
+ # Path to db_185.h include
+ DBM_INCLUDE:=/usr/include
diff --git a/iproute2-2.6.9-ss.patch b/iproute2-2.6.9-ss.patch
new file mode 100644
index 0000000..79ff596
--- /dev/null
+++ b/iproute2-2.6.9-ss.patch
@@ -0,0 +1,11 @@
+--- iproute2-2.6.9/misc/ss.c.ss	2004-08-31 20:32:14.000000000 +0200
++++ iproute2-2.6.9/misc/ss.c	2004-09-01 13:02:54.574367176 +0200
+@@ -34,7 +34,7 @@
+ #include "SNAPSHOT.h"
+ 
+ #include <asm/byteorder.h>
+-#include <linux/tcp.h>
++#include <netinet/tcp.h>
+ #include <linux/tcp_diag.h>
+ 
+ int resolve_hosts = 0;
diff --git a/sources b/sources
index 4bf1957..17e418d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c7e5f3a10e703745ecdc613f7a7d187  iproute2-2.4.7-now-ss020116-try.tar.gz
+4079036ec0283341d37f96ce9ae1a932  iproute2-2.6.9-ss040831.tar.gz