diff --git a/pkgs/tools/networking/glusterfs/default.nix b/pkgs/tools/networking/glusterfs/default.nix
new file mode 100644
index 000000000000..3995faa588bc
--- /dev/null
+++ b/pkgs/tools/networking/glusterfs/default.nix
@@ -0,0 +1,28 @@
+a :  
+let 
+  s = import ./src-for-default.nix;
+  buildInputs = with a; [
+    fuse bison flex
+  ];
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+  configureFlags = [
+    ''--with-mountutildir="$out/sbin"''
+    ];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "Distributed storage system";
+    maintainers = [
+      a.lib.maintainers.raskin
+    ];
+    platforms = with a.lib.platforms; 
+      linux ++ freebsd;
+  };
+}
diff --git a/pkgs/tools/networking/glusterfs/src-for-default.nix b/pkgs/tools/networking/glusterfs/src-for-default.nix
new file mode 100644
index 000000000000..eeda32796f5b
--- /dev/null
+++ b/pkgs/tools/networking/glusterfs/src-for-default.nix
@@ -0,0 +1,8 @@
+rec {
+  advertisedUrl="http://ftp.gluster.com/pub/gluster/glusterfs/2.0/2.0.6/glusterfs-2.0.6.tar.gz";
+  version = "2.0.6";
+  url="http://ftp.gluster.com/pub/gluster/glusterfs/2.0/2.0.6/glusterfs-2.0.6.tar.gz";
+  hash = "0qr8smwncrr63vzbaf2v4fwpdck3jpgywn2rq8sdhifff67ydc9h";
+  name = "glusterfs-2.0.6";
+  
+}
diff --git a/pkgs/tools/networking/glusterfs/src-info-for-default.nix b/pkgs/tools/networking/glusterfs/src-info-for-default.nix
new file mode 100644
index 000000000000..273ee4512e1f
--- /dev/null
+++ b/pkgs/tools/networking/glusterfs/src-info-for-default.nix
@@ -0,0 +1,6 @@
+{
+  downloadPage = "http://ftp.gluster.com/pub/gluster/glusterfs/2.0/";
+  sourceRegexp = "^2[.]0[.]";
+  choiceCommand = ''tail -1 | sed -re 's@(.*)/@&glusterfs-\1.tar.gz@' '';
+  baseName = "glusterfs";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d2297bcf42a..3a6c921b862b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -746,6 +746,12 @@ let
     inherit (xlibs) xproto libXt libX11;
   };
 
+  glusterfs = builderDefsPackage ../tools/networking/glusterfs {
+    inherit fuse;
+    bison = bison24;
+    flex = flex2535;
+  };
+
   glxinfo = import ../tools/graphics/glxinfo {
     inherit fetchurl stdenv x11 mesa;
   };