diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
new file mode 100644
index 000000000000..7da8efcb6224
--- /dev/null
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -0,0 +1,17 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "OpenVPN-2.1_rc15";
+
+  src = fetchurl {
+    url = http://openvpn.net/release/openvpn-2.1_rc15.tar.gz;
+    sha256 = "198k5lbw0bnx67hgflzlzncmdnww0wa7fll0kkirmckav93y7kv6";
+  };
+
+  buildInputs = [ iproute lzo openssl];
+
+  meta = { 
+      description="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes.";
+      homepage="http://openvpn.net/";
+      license = "GPLv2";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fc35a99187d..15dcb40c1760 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1056,6 +1056,10 @@ let
     pamSupport = getPkgConfig "openssh" "pam" true;
   };
 
+  openvpn = import ../tools/networking/openvpn {
+    inherit fetchurl stdenv iproute lzo openssl;
+  };
+
   p7zip = import ../tools/archivers/p7zip {
     inherit fetchurl stdenv;
   };