diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index 861845ab24f4..d3a2a5a66f7f 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -1,16 +1,20 @@
-{stdenv, fetchurl, openssl}:
+args: with args;
 
-stdenv.mkDerivation {
-  name = "vsftpd-2.0.3";
+stdenv.mkDerivation rec {
+  name = "vsftpd-2.0.5";
   src = fetchurl {
-    url = ftp://vsftpd.beasts.org/users/cevans/vsftpd-2.0.3.tar.gz;
-    md5 = "74936cbd8e8251deb1cd99c5fb18b6f8";
+    url = "ftp://vsftpd.beasts.org/users/cevans/${name}.tar.gz";
+	sha256 = "0nzsxknnaqnfk853yjsmi31sl02jf5ydix9wxbldv4i7vzqfnqjl";
   };
   
-  NIX_LDFLAGS = [ "-lcrypt" "-lssl" "-lcrypto" ];
+  NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap";
 
-  builder = ./builder.sh ;
+  preInstall = ''
+  ensureDir $out/{,s}bin
+  ensureDir $out/man/man{5,8}
+  '';
 
   patches = [ ./fix.patch ] ;
-  buildInputs = [ openssl ];
+  preConfigure = ''sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h'';
+  buildInputs = [ openssl libcap pam ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c71f808ffb88..31cacd146140 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3185,8 +3185,7 @@ rec {
   };
 
   vsftpd = import ../servers/ftp/vsftpd {
-    inherit fetchurl openssl ;
-    stdenv = overrideGCC stdenv gcc295 ;
+    inherit fetchurl openssl stdenv libcap pam;
   };
 
   xorg = recurseIntoAttrs (import ../servers/x11/xorg {