diff --git a/iproute-arphrd-none.diff b/iproute-arphrd-none.diff
new file mode 100644
index 0000000..5912604
--- /dev/null
+++ b/iproute-arphrd-none.diff
@@ -0,0 +1,22 @@
+Give ARPHRD_NONE a name so that "tun"-style tunnels don't appear
+as link/65534.
+
+Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
+---
+ lib/ll_types.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: iproute2-2.6.23/lib/ll_types.c
+===================================================================
+--- iproute2-2.6.23.orig/lib/ll_types.c
++++ iproute2-2.6.23/lib/ll_types.c
+@@ -124,6 +124,9 @@ __PF(IEEE80211_PRISM,ieee802.11/prism)
+ #ifdef ARPHRD_IEEE80211_RADIOTAP
+ __PF(IEEE80211_RADIOTAP,ieee802.11/radiotap)
+ #endif
++#ifdef ARPHRD_NONE
++__PF(NONE,none)
++#endif
+ #ifdef ARPHRD_VOID
+ __PF(VOID,void)
+ #endif
diff --git a/iproute2.changes b/iproute2.changes
index ae19ab0..7cbbddd 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 23 22:45:41 UTC 2010 - jengelh@medozas.de
+
+- add a patch to avoid tun tunnels being shown as "link/65534"
+
 -------------------------------------------------------------------
 Sat Dec 19 18:29:53 CET 2009 - jengelh@medozas.de
 
diff --git a/iproute2.spec b/iproute2.spec
index 0289c8b..d2f7217 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -20,12 +20,12 @@
 
 Name:           iproute2
 BuildRequires:  bison db-devel flex ghostscript-fonts-std ghostscript-x11 libpng-devel libtiff-devel sgmltool texlive-latex xorg-x11-devel
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Productivity/Networking/Routing
 Provides:       iproute 
 AutoReqProv:    on
 Version:        2.6.29.1
-Release:        7
+Release:        8
 %define rversion        2.6.29-1
 Summary:        Advanced Routing
 Url:            http://developer.osdl.org/dev/iproute2/
@@ -44,10 +44,11 @@ Patch10:        %name-2.6.29-1-ss-pclose.diff
 Patch11:        %name-2.6.29-1-neightable.diff
 Patch12:        %name-2.6.29-1-typelabels.diff
 Patch13:        %name-2.6.29-1-memleak.diff
+Patch14:        iproute-arphrd-none.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package -n libnetlink-devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        A Higher Level Interface to the Netlink Service
 Group:          Development/Libraries/C and C++
 Provides:       libnetlink
@@ -86,6 +87,7 @@ Authors:
 %patch11
 %patch12
 %patch13
+%patch14 -p1
 find . -name *.orig -print0 | xargs -r0 rm -v
 
 %build