diff --git a/pkgs/tools/security/metasploit/3.1.nix b/pkgs/tools/security/metasploit/3.1.nix
deleted file mode 100644
index c3aab9b709e3..000000000000
--- a/pkgs/tools/security/metasploit/3.1.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-args @ { makeWrapper, ... }: with args;
-rec {
-  src = fetchurl {
-    url = http://www.packetstormsecurity.nl/UNIX/utilities/framework-3.1.tar.gz;
-    sha256 = "114znq9dfcyh9gcj57p3zsc0d0amlzhwidmg8qjcgxpjh28h1afx";
-  };
-
-  buildInputs = [makeWrapper];
-  configureFlags = [];
-
-  doInstall = fullDepEntry(''
-    mkdir -p $out/share/msf
-    mkdir -p $out/bin
-
-    cp -r * $out/share/msf
-
-    for i in $out/share/msf/msf*; do
-        makeWrapper $i $out/bin/$(basename $i) --prefix RUBYLIB : $out/share/msf/lib
-    done
-  '') ["minInit" "defEnsureDir" "doUnpack" "addInputs"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doInstall" (doPatchShebangs "$out/share/msf")];
-
-  name = "metasploit-framework-3.1";
-  meta = {
-    description = "Metasploit Framework - a collection of exploits";
-    homepage = "http://framework.metasploit.org/";
-  };
-}
-
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
new file mode 100644
index 000000000000..7a9dcdb8d89a
--- /dev/null
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, makeWrapper, ruby }:
+
+stdenv.mkDerivation rec {
+  name = "metasploit-framework-${version}";
+  version = "3.3.1";
+
+  src = fetchurl {
+    url = "http://downloads.metasploit.com/data/releases/archive/framework-${version}.tar.bz2";
+    sha256 = "07clzw1zfnqjhyydsc4mza238isai58p7aygh653qxsqb9a0j7qw";
+  };
+
+  buildInputs = [makeWrapper];
+
+  installPhase = ''
+    mkdir -p $out/share/msf
+    mkdir -p $out/bin
+
+    cp -r * $out/share/msf
+
+    for i in $out/share/msf/msf*; do
+        makeWrapper $i $out/bin/$(basename $i) --prefix RUBYLIB : $out/share/msf/lib
+    done
+  '';
+
+  postInstall = ''
+    patchShebangs $out/share/msf
+  '';
+
+  meta = {
+    description = "Metasploit Framework - a collection of exploits";
+    homepage = https://github.com/rapid7/metasploit-framework/wiki;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71cb845c53d0..d84ac49021b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2294,7 +2294,7 @@ let
 
   mscgen = callPackage ../tools/graphics/mscgen { };
 
-  msf = builderDefsPackage (callPackage ../tools/security/metasploit/3.1.nix) { };
+  msf = callPackage ../tools/security/metasploit { };
 
   mssys = callPackage ../tools/misc/mssys { };