diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index cc5339ba9000..c97c7416de1e 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,11 +1,11 @@
-{fetchurl, stdenv, flex, bison, db4, iptables}:
+{ fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "iproute2-2.6.35";
+  name = "iproute2-3.6.0";
 
   src = fetchurl {
-    url = "http://pkgs.fedoraproject.org/repo/pkgs/iproute/iproute2-2.6.35.tar.bz2/b0f281b3124bf04669e18f5fe16d4934/iproute2-2.6.35.tar.bz2";
-    sha256 = "18why1wy0v859axgrlfxn80zmskss0410hh9rf5gn9cr29zg9cla";
+    url = http://kernel.org/pub/linux/utils/net/iproute2/iproute2-3.6.0.tar.xz;
+    sha256 = "0d05av2s7p552yszgj6glz6d74jlmg392s7n74hicgqfl16m85rd";
   };
 
   patches = [ ./vpnc.patch ];
@@ -15,20 +15,25 @@ stdenv.mkDerivation rec {
       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/${name}"
-  + " MANDIR=$(out)/share/man";
+    + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}"
+    + " MANDIR=$(out)/share/man";
 
-  buildInputs = [db4 iptables];
-  buildNativeInputs = [bison flex db4];
+  buildInputs = [ db4 iptables ];
+  buildNativeInputs = [ bison flex pkgconfig ];
+
+  enableParallelBuilding = true;
+
+  # Get rid of useless TeX/SGML docs.
+  postInstall = "rm -rf $out/share/doc";
 
   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";
+    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;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }