diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 7b19d914cf3..7b9eddeb6b9 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -93,6 +93,15 @@
     stdenv = stdenv;
   };
 
+  graphviz = (import ../tools/graphics/graphviz) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    x11 = xfree86;
+    libpng = libpng;
+    libjpeg = libjpeg;
+    expat = expat;
+  };
+
 
   ### SHELLS
 
diff --git a/pkgs/tools/graphics/graphviz/builder.sh b/pkgs/tools/graphics/graphviz/builder.sh
new file mode 100755
index 00000000000..f37ee4412c2
--- /dev/null
+++ b/pkgs/tools/graphics/graphviz/builder.sh
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$x11 $libpng $libjpeg $expat $freetype"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd graphviz-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
new file mode 100644
index 00000000000..b1689ec234e
--- /dev/null
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, x11, libpng, libjpeg, expat}:
+
+assert !isNull x11 && !isNull libpng && !isNull libjpeg
+  && !isNull expat;
+
+derivation {
+  name = "graphviz-1.10";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.10.tar.gz;
+    md5 = "e1402531abff68d146bf94e72b44dc2a";
+  };
+
+  stdenv = stdenv;
+  x11 = x11;
+  libpng = libpng;
+  libjpeg = libjpeg;
+  expat = expat;
+}