diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index b98e083128e..b4cc6a29185 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -143,6 +143,10 @@ rec {
     inherit (xlibs) libXaw;
   };
 
+  gnuplot = (import ../tools/graphics/gnuplot) {
+    inherit fetchurl stdenv zlib libpng texinfo;
+  };
+
   exif = (import ../tools/graphics/exif) {
     inherit fetchurl stdenv pkgconfig libexif popt;
   };
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
new file mode 100644
index 00000000000..ea97a1c8e54
--- /dev/null
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, zlib, libpng, texinfo}:
+
+stdenv.mkDerivation {
+  # Gnuplot (which isn't open source) has a license that requires that
+  # we "add special version identification to distinguish your version
+  # in addition to the base release version number".  Hence the "nix"
+  # suffix.
+  name = "gnuplot-4.0-nix";
+
+#  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/gnuplot/gnuplot-4.0.0.tar.gz;
+    md5 = "66258443d9f93cc4f46b147dac33e63a";
+  };
+
+  configureFlags = ["--without-x"];
+
+  buildInputs = [zlib libpng texinfo];
+}