diff --git a/pkgs/tools/graphics/graphviz/builder.sh b/pkgs/tools/graphics/graphviz/builder.sh
new file mode 100644
index 000000000000..56b012f4563a
--- /dev/null
+++ b/pkgs/tools/graphics/graphviz/builder.sh
@@ -0,0 +1,12 @@
+. $stdenv/setup
+
+configureFlags="\
+    --with-pngincludedir=$libpng/include \
+    --with-pnglibdir=$libpng/lib \
+    --with-jpegincludedir=$libjpeg/include \
+    --with-jpeglibdir=$libjpeg/lib \
+    --with-expatincludedir=$expat/include \
+    --with-expatlibdir=$expat/lib \
+    "
+
+genericBuild
\ No newline at end of file
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index e29554c78ac5..79ce2d0bdfd8 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -3,15 +3,18 @@
 assert libpng != null && libjpeg != null && expat != null;
 
 stdenv.mkDerivation {
-  name = "graphviz-1.12";
+  name = "graphviz-2.2";
 
+  builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/graphviz-1.12.tar.gz;
-    md5 = "a5c004c42f58c957f772060d0889059c";
+    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.tar.gz;
+    md5 = "9275d30695a5c22f360acbef7b85acd3";
   };
 
   buildInputs = [x11 libpng libjpeg expat libXaw yacc];
   configureFlags = [
     (if x11 == null then "--without-x" else "")
   ];
+  
+  inherit libpng libjpeg expat;
 }