diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix
index 02b6321d18c..1f590fec69c 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/pkgs/tools/X11/keynav/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, libX11, xextproto, libXtst, imake, libXi, libXext }:
+{ stdenv, fetchurl, pkgconfig, libX11, xextproto, libXtst, libXi, libXext
+, libXinerama, glib, cairo, xdotool }:
 
 stdenv.mkDerivation rec {
-  name = "keynav-20070903";
+  name = "keynav-0.20101014.3067";
 
   src = fetchurl {
-    url = "http://www.semicomplete.com/files/keynav/${name}.tar.gz";
-    sha256 = "037mbgm78jwy0qd0z691pgx4zcpkk5544fx8ajm2mx4y80k2d9kk";
+    url = "https://semicomplete.googlecode.com/files/${name}.tar.gz";
+    sha256 = "05jpq17xqccv97mrqq2rgm4jwq4s8lkyq49rfaq7sz4gbnq1832k";
   };
 
-  buildInputs = [libX11 xextproto libXtst imake libXi libXext];
-
-  NIX_LDFLAGS = "-lXext";
+  buildInputs = [ pkgconfig libX11 xextproto libXtst libXi libXext libXinerama
+                  glib cairo xdotool ];
 
   installPhase =
     ''
@@ -19,7 +19,11 @@ stdenv.mkDerivation rec {
       cp keynavrc $out/share/keynav/doc
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Generate X11 mouse clicks from keyboard";
+    homepage = http://www.semicomplete.com/projects/keynav/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.linux;
   };
 }