diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index bc5af2f37c7..f3d18036d07 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -2,11 +2,11 @@
 , guiSupport ? false, tk ? null }:
 
 stdenv.mkDerivation rec {
-  name = "mercurial-1.5.1";
+  name = "mercurial-1.6.4";
   
   src = fetchurl {
     url = "http://www.selenic.com/mercurial/release/${name}.tar.gz";
-    sha256 = "5796dd27c884c0effb027c71925fe2c2506b08e0ac8c5f53db259d378ef96569";
+    sha256 = "04c8vj942ys71dn0bjga33i0qi5hybjjhq087xd0jp29ijzxp3hy";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
@@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
           --prefix PYTHONPATH : "$(toPythonPath $out)" \
           $WRAP_TK
       done
+
+      # copy hgweb.cgi to allow use in apache
+      ensureDir $out/share/cgi-bin
+      cp -v hgweb.cgi $out/share/cgi-bin
+      chmod u+x $out/share/cgi-bin/hgweb.cgi
     '';
 
   meta = {