diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix
new file mode 100644
index 00000000000..2a0603e27c9
--- /dev/null
+++ b/pkgs/applications/misc/gv/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, Xaw3d, ghostscriptX }:
+
+stdenv.mkDerivation {
+  name = "gv-3.6.1";
+
+  src = fetchurl {
+    url = http://ftp.gnu.org/gnu/gv/gv-3.6.3.tar.gz;
+    sha256 = "9486c25675719e986cbd77b48204025e825c46258b6750deeb64b3940685a033";
+  };
+
+  buildInputs = [ Xaw3d ghostscriptX ];
+  
+  postConfigure = [ "sed 's|\\<gs\\>|${ghostscriptX}/bin/gs|g' -i src/*.am src/*.ad" ];
+
+  inherit ghostscriptX;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 171bab66c24..ac037f80a7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3078,6 +3078,10 @@ rec {
     inherit (gtkLibs) glib;
   };
 
+  gv = import ../applications/misc/gv {
+    inherit fetchurl stdenv Xaw3d ghostscriptX;
+  };
+ 
   haskellMode = import ../applications/editors/emacs-modes/haskell {
     inherit fetchurl stdenv;
   };
@@ -3643,6 +3647,11 @@ rec {
     x11Support = false;
   };
 
+  ghostscriptX = lowPrio (appendToName "with-X" (import ../misc/ghostscript {
+    inherit fetchurl stdenv libjpeg libpng zlib x11;
+    x11Support = true;
+  }));
+ 
   keynav = import ../tools/X11/keynav {
 	inherit stdenv fetchurl;
 	inherit (xlibs) libX11 xextproto libXtst