diff --git a/fix-hardware-address-size-problem.diff b/iproute2-2.6.25-hw-address-size.diff
similarity index 100%
rename from fix-hardware-address-size-problem.diff
rename to iproute2-2.6.25-hw-address-size.diff
diff --git a/iproute2-m_skbedit.patch b/iproute2-2.6.25-m_skbedit.patch
similarity index 100%
rename from iproute2-m_skbedit.patch
rename to iproute2-2.6.25-m_skbedit.patch
diff --git a/iproute2-q_multiq.patch b/iproute2-2.6.25-q_multiq.patch
similarity index 100%
rename from iproute2-q_multiq.patch
rename to iproute2-2.6.25-q_multiq.patch
diff --git a/iproute2-2.6.25-skbedit-memset.diff b/iproute2-2.6.25-skbedit-memset.diff
new file mode 100644
index 0000000..950d774
--- /dev/null
+++ b/iproute2-2.6.25-skbedit-memset.diff
@@ -0,0 +1,11 @@
+--- tc/m_skbedit.c	2009-01-27 10:42:39.000000000 +0000
++++ tc/m_skbedit.c	2009-01-27 10:45:09.000000000 +0000
+@@ -57,6 +57,8 @@
+ 	__u16 queue_mapping;
+ 	__u32 flags = 0, priority;
+ 
++	memset(&sel, 0, sizeof(struct tc_skbedit));
++
+ 	if (matches(*argv, "skbedit") != 0)
+ 		return -1;
+ 
diff --git a/iproute2.changes b/iproute2.changes
index 51ffdc0..a7ead4d 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jan 27 11:47:57 CET 2009 - ms@suse.de
+
+- fixed a bug in which the memory for the tc_skbedit struct was
+  being used uninitialized to 0.  This patch corrects the issue
+  by using a memset to 0 out the memory of the
+  structure (bnc #438950)
+
 -------------------------------------------------------------------
 Thu Dec 11 15:09:10 CET 2008 - agruen@suse.de
 
diff --git a/iproute2.spec b/iproute2.spec
index d105121..81a9804 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package iproute2 (Version 2.6.25)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@ Group:          Productivity/Networking/Routing
 Provides:       iproute 
 AutoReqProv:    on
 Version:        2.6.25
-Release:        42
+Release:        43
 Summary:        Advanced Routing
 Url:            http://developer.osdl.org/dev/iproute2/
 Source0:        %name-%version.tar.bz2
@@ -36,11 +36,12 @@ Patch3:         %name-2.6.25-tc-flex-fixes.diff
 Patch4:         %name-2.6.25-resolve-address.diff
 Patch5:         %name-2.6.25-fragtimeout.diff
 Patch6:         %name-2.6.25-flushcheckuid.diff
-Patch7:         %name-m_skbedit.patch
-Patch8:         %name-q_multiq.patch
+Patch7:         %name-2.6.25-m_skbedit.patch
+Patch8:         %name-2.6.25-q_multiq.patch
 Patch9:         %name-2.6.25-DCCP-redefine
 Patch10:        %name-2.6.25-warnings.diff
-Patch11:        fix-hardware-address-size-problem.diff
+Patch11:        %name-2.6.25-hw-address-size.diff
+Patch12:        %name-2.6.25-skbedit-memset.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package -n libnetlink-devel
@@ -81,6 +82,7 @@ Authors:
 %patch9 -p1
 %patch10
 %patch11 -p1
+%patch12
 find . -name *.orig -print0 | xargs -r0 rm -v
 
 %build
@@ -131,6 +133,11 @@ rm -rf $RPM_BUILD_ROOT
 %_libdir/lib*
 
 %changelog
+* Tue Jan 27 2009 ms@suse.de
+- fixed a bug in which the memory for the tc_skbedit struct was
+  being used uninitialized to 0.  This patch corrects the issue
+  by using a memset to 0 out the memory of the
+  structure (bnc #438950)
 * Thu Dec 11 2008 agruen@suse.de
 - Change max length of the MAC address from 16 bytes to 32 bytes
   to accommodate infiniband (bnc#445014).