diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 604a0bba6ff..ba0f1d4fd0f 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,24 +1,31 @@
-{fetchurl, stdenv, flex, bison, db4}:
+{fetchurl, stdenv, flex, bison, db4, iptables}:
 
 stdenv.mkDerivation rec {
-  name = "iproute2-2.6.29-1";
+  name = "iproute2-2.6.35";
 
   src = fetchurl {
     url = "http://devresources.linux-foundation.org/dev/iproute2/download/${name}.tar.bz2";
-    sha256 = "16zvhdzv7yqyvmwxyqa6shzsld6r0wpnk37dig69sk20wpzv1zqk";
+    sha256 = "18why1wy0v859axgrlfxn80zmskss0410hh9rf5gn9cr29zg9cla";
   };
  
   preConfigure =
     ''
       patchShebangs ./configure
+      sed -e '/ARPDDIR/d' -i Makefile
     '';
+  postConfigure = "cat Config";
 
-  makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc MANDIR=$(out)/share/man";
+  makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin"
+   + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}"
+  + " MANDIR=$(out)/share/man";
 
-  buildInputs = [bison flex db4];
+  buildInputs = [bison flex db4 iptables];
 
   meta = {
     homepage =
       http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2;
+    description = "A collection of utilities for controlling TCP / IP"
+      + " networking and traffic control in Linux";
+    platforms = stdenv.lib.platforms.linux;
   };
 }