diff --git a/pkgs/development/tools/documentation/haddock/default.nix b/pkgs/development/tools/documentation/haddock/default.nix
new file mode 100644
index 000000000000..a38db0977d67
--- /dev/null
+++ b/pkgs/development/tools/documentation/haddock/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, ghc}:
+
+stdenv.mkDerivation (rec {
+  pname = "haddock";
+  version = "2.0.0.0";
+  name = "${pname}-${version}";
+  src = fetchurl {
+    url = "http://hackage.haskell.org/packages/archive/${pname}/${version}/${name}.tar.gz";
+    sha256 = "a2ea5bdc127bc8b189a8d869f582ec774fea0933e7f5ca89549a6c142b9993df";
+  };
+  buildInputs = [ghc];
+
+  configurePhase = '' 
+    ghc --make Setup.lhs
+    ./Setup configure -v --prefix="$out"
+  '';
+
+  buildPhase = ''
+    ./Setup build
+  '';
+
+  installPhase = ''
+    ./Setup install
+  '';
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f26557075772..22bbc65cd410 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1478,6 +1478,11 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  haddock = import ../development/tools/documentation/haddock {
+    inherit fetchurl stdenv;
+    ghc = ghc68;
+  };
+
   happy = import ../development/tools/parsing/happy {
     inherit fetchurl stdenv perl ghc;
   };