diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index db0df695f2b..7ca20e8a8d5 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -1,4 +1,6 @@
-args: with args;
+{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, emacs
+, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_42
+, libxslt }:
 
 stdenv.mkDerivation rec {
   name = "git-1.5.4.2";
@@ -9,12 +11,15 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [curl openssl zlib expat gettext]
-    ++ (if emacs != null then [emacs] else []);
+    ++ (if emacs != null then [emacs] else [])
+    ++ # documentation tools
+       [ asciidoc texinfo xmlto docbook2x
+         docbook_xsl docbook_xml_dtd_42 libxslt ];
 
   makeFlags="prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}";
 
   postInstall =
-    if emacs != null then
+   (if emacs != null then
 	 ''# Install Emacs mode.
 	   echo "installing Emacs mode..."
 	   make install -C contrib/emacs prefix="$out"
@@ -23,7 +28,10 @@ stdenv.mkDerivation rec {
 	   # install. ''
        else
          ''echo "NOT installing Emacs mode.  Set \`git.useEmacs' to \`true' in your"
-	   echo "\`~/.nixpkgs/config.nix' file to change it."'';
+	   echo "\`~/.nixpkgs/config.nix' file to change it."'')
+   + ''# Install man pages and Info manual
+       make PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
+         -C Documentation'';
 
   meta = {
     license = "GPLv2";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8570bcd5f5..a0d0b8f1f19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4970,7 +4970,8 @@ rec {
   };
 
   git = import ../applications/version-management/git {
-    inherit fetchurl stdenv curl openssl zlib expat perl gettext;
+    inherit fetchurl stdenv curl openssl zlib expat perl gettext
+	    docbook_xsl docbook_xml_dtd_42 libxslt;
     emacs = if (getConfig ["git" "useEmacs"] true) then emacs else null;
   };