diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index f30d1fcdffe..74bfc2fb4dc 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -157,7 +157,7 @@ rec {
   };
 
   graphviz = (import ../tools/graphics/graphviz) {
-    inherit fetchurl stdenv libpng libjpeg expat x11 yacc;
+    inherit fetchurl stdenv libpng libjpeg expat x11 yacc libtool;
     inherit (xlibs) libXaw;
   };
 
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 96052721365..e5d29e414ed 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, x11, libpng, libjpeg, expat, libXaw, yacc}:
+{stdenv, fetchurl, x11, libpng, libjpeg, expat, libXaw, yacc, libtool}:
 
 assert libpng != null && libjpeg != null && expat != null;
 
 stdenv.mkDerivation {
-  name = "graphviz-2.2";
+  name = "graphviz-2.4";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/graphviz-2.2.tar.gz;
-    md5 = "9275d30695a5c22f360acbef7b85acd3";
+    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.4.tar.gz;
+    md5 = "f1074d38a7eeb5e5b2ebfdb643aebf8a";
   };
 
-  buildInputs = [x11 libpng libjpeg expat libXaw yacc];
+  buildInputs = [x11 libpng libjpeg expat libXaw yacc libtool];
   configureFlags = [
     (if x11 == null then "--without-x" else "")
   ];