diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 5a09ec2a80b9..1c843a666360 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,25 +1,36 @@
-{stdenv, fetchurl, fuse, bison, flex, openssl, python, ncurses, readline}:
+{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline,
+ autoconf, automake, libtool, pkgconfig, zlib, libaio}:
 let 
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.4.3";
+    version="3.5.0";
     name="${baseName}-${version}";
-    hash="1vzdihsy4da11jsa46n1n2xk6d40g7v0zrlqvs3pb9k07fql5kag";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.3/glusterfs-3.4.3.tar.gz";
-    sha256="0j1yvpdb1bydsh3pqlyr23mfvra5bap9rxba910s9cn61mpy99bj";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.0/glusterfs-3.5.0.tar.gz";
+    sha256="0d9jlgxg19f2ajf5i4yw4f91n161rsi8fm95442ckci3xnz21zir";
   };
   buildInputs = [
-    fuse bison flex openssl python ncurses readline
+    fuse bison flex_2_5_35 openssl python ncurses readline
+    autoconf automake libtool pkgconfig zlib libaio
   ];
 in
 stdenv.mkDerivation
 rec {
   inherit (s) name version;
   inherit buildInputs;
+  preConfigure = ''
+    ./autogen.sh
+    '';
   configureFlags = [
     ''--with-mountutildir="$out/sbin"''
     ];
+  preInstall = ''
+    substituteInPlace api/examples/Makefile --replace '$(DESTDIR)' $out
+    substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out
+    substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out
+    substituteInPlace xlators/features/glupy/examples/Makefile --replace '$(DESTDIR)' $out
+    substituteInPlace xlators/features/glupy/src/Makefile --replace '$(DESTDIR)' $out
+    '';
   src = fetchurl {
     inherit (s) url sha256;
   };