diff --git a/iproute2-2.6.23-qdisc.diff b/iproute2-2.6.23-qdisc.diff
new file mode 100644
index 0000000..a57b836
--- /dev/null
+++ b/iproute2-2.6.23-qdisc.diff
@@ -0,0 +1,10 @@
+--- lib/libnetlink.c	2007-10-16 21:26:51.000000000 +0000
++++ lib/libnetlink.c	2008-04-09 05:27:02.000000000 +0000
+@@ -632,6 +632,6 @@
+ 		rta = RTA_DATA(rta) + RTA_ALIGN(len);
+ 		return parse_rtattr_nested(tb, max, rta);
+ 	}
+-	memset(tb, 0, sizeof(struct rtattr *) * max);
++	memset(tb, 0, sizeof(struct rtattr *) * (max + 1));
+ 	return 0;
+ }
diff --git a/iproute2.changes b/iproute2.changes
index d8e5b4f..e595a32 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 30 10:02:03 CEST 2008 - ms@suse.de
+
+- fixed 'tc qdisc' segmentation fault (bnc #404755)
+
 -------------------------------------------------------------------
 Thu May  8 11:48:54 CEST 2008 - ms@suse.de
 
diff --git a/iproute2.spec b/iproute2.spec
index e29f274..7c1e028 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -18,7 +18,7 @@ Group:          Productivity/Networking/Routing
 Provides:       iproute 
 AutoReqProv:    on
 Version:        2.6.23
-Release:        65
+Release:        78
 Summary:        Advanced Routing
 Url:            http://developer.osdl.org/dev/iproute2/
 Source0:        %name-%version.tar.bz2
@@ -30,6 +30,7 @@ Patch4:         %name-2.6.23-resolve-address.diff
 Patch5:         %name-2.6.23-fragtimeout.diff
 Patch6:         %name-2.6.23-flushcheckuid.diff
 Patch7:         %name-2.6.23-strip.diff
+Patch8:         %name-2.6.23-qdisc.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package -n libnlink
@@ -66,6 +67,7 @@ Authors:
 %patch5
 %patch6
 %patch7
+%patch8
 find . -name *.orig -print0 | xargs -r0 rm -v
 
 %build
@@ -115,6 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 %_libdir/lib*
 
 %changelog
+* Mon Jun 30 2008 ms@suse.de
+- fixed 'tc qdisc' segmentation fault (bnc #404755)
 * Thu May 08 2008 ms@suse.de
 - compile libnetlink with -fPIC (bnc #388021)
 * Wed Apr 16 2008 schwab@suse.de