diff --git a/package/base/iproute2/iproute2.conf b/package/base/iproute2/iproute2.conf
index 2e420049b..887e67492 100644
--- a/package/base/iproute2/iproute2.conf
+++ b/package/base/iproute2/iproute2.conf
@@ -35,14 +35,10 @@ ipr2_pm() {
 }
 
 runconf=0
-makeopt="KERNEL_INCLUDE=$root/usr/include"
-makeinstopt="SBINDIR=/sbin DESTDIR=$root install"
+var_append makeopt " " "KERNEL_INCLUDE=$root/usr/include"
+var_append makeinstopt " " "SBINDIR=/sbin DESTDIR=$root"
 
 postmake="ipr2_pm"
 
 pkginstalled bdb.. && [ $stagelevel -gt 1 ] || \
 	var_append patchfiles ' ' $confdir/bdb_unavailable.diff
-
-# use real kernel headers for building iproute2
-var_append CC_WRAPPER_APPEND " " "-I/usr/src/linux/include"
-
diff --git a/package/base/iproute2/libutil.patch b/package/base/iproute2/libutil.patch
new file mode 100644
index 000000000..ee9691264
--- /dev/null
+++ b/package/base/iproute2/libutil.patch
@@ -0,0 +1,10 @@
+--- iproute2/Makefile~	2007-03-13 22:50:56.000000000 +0100
++++ iproute2/Makefile	2007-07-17 20:03:59.000000000 +0200
+@@ -29,6 +29,7 @@
+ 
+ SUBDIRS=lib ip tc misc netem genl
+ 
++LIBUTIL=../lib/libutil.a
+ LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
+ 
+ all: Config
diff --git a/package/base/iproute2/remove_conflicting_defines.patch b/package/base/iproute2/remove_conflicting_defines.patch
new file mode 100644
index 000000000..877477530
--- /dev/null
+++ b/package/base/iproute2/remove_conflicting_defines.patch
@@ -0,0 +1,17 @@
+These defines are not used anywhere in iproute2 (and the header is not
+exported), but cause errors in include/linux/types.h.
+
+--- iproute2/include/iptables_common.h~	2007-03-13 22:50:56.000000000 +0100
++++ iproute2/include/iptables_common.h	2007-07-17 20:00:14.000000000 +0200
+@@ -43,9 +43,11 @@
+   extern void init_extensions(void);
+ #endif
+ 
++/*
+ #define __be32	u_int32_t
+ #define __le32	u_int32_t
+ #define __be16	u_int16_t
+ #define __le16	u_int16_t
++*/
+ 
+ #endif /*_IPTABLES_COMMON_H*/