diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix
new file mode 100644
index 00000000000..d2e53d677e2
--- /dev/null
+++ b/pkgs/tools/networking/badvpn/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchurl, cmake, openssl, nss, pkgconfig, nspr, bash}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="badvpn";
+    version="1.999.128";
+    name="${baseName}-${version}";
+    hash="1z4v1jydv8zkkszsq7scc17rw5dqz9zlpcc40ldxsw34arfqvcnn";
+    url="http://badvpn.googlecode.com/files/badvpn-1.999.128.tar.bz2";
+    sha256="1z4v1jydv8zkkszsq7scc17rw5dqz9zlpcc40ldxsw34arfqvcnn";
+  };
+  buildInputs = [
+    cmake openssl nss pkgconfig nspr
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+
+  preConfigure = ''
+    find . -name '*.sh' -exec sed -e 's@#!/bin/sh@${stdenv.shell}@' -i '{}' ';'
+    find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';'
+  '';
+
+  meta = {
+    inherit (s) version;
+    description = ''A set of network-related (mostly VPN-related) tools'';
+    license = stdenv.lib.licenses.bsd3 ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/badvpn/default.upstream b/pkgs/tools/networking/badvpn/default.upstream
new file mode 100644
index 00000000000..1c746698fef
--- /dev/null
+++ b/pkgs/tools/networking/badvpn/default.upstream
@@ -0,0 +1,3 @@
+url http://gc.codehum.com/p/badvpn/downloads/list
+version_link '[.]tar[.][a-z0-9]+$'
+process 'gc.codehum.com//' ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e05f7647d2e..263cbe8ef12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -517,6 +517,8 @@ let
 
   babeld = callPackage ../tools/networking/babeld { };
 
+  badvpn = callPackage ../tools/networking/badvpn {};
+
   banner = callPackage ../games/banner {};
 
   barcode = callPackage ../tools/graphics/barcode {};