diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
new file mode 100644
index 00000000000..136a6efe7a1
--- /dev/null
+++ b/pkgs/tools/security/tor/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, libevent, openssl, zlib}:
+
+stdenv.mkDerivation {
+  name = "tor-0.2.1.26";
+
+  src = fetchurl {
+    url = "http://www.torproject.org/dist/tor-0.2.1.26.tar.gz";
+    sha256 = "18kz1hs6lvckkddy4y36gi7ly03ar2il2xzkrf8bfgif1gnn1p3c";
+  };
+
+  buildInputs = [libevent openssl zlib];
+ 
+  doCheck = true;
+
+  meta = {
+    homepage = http://www.torproject.org/;
+    description = "Tor is an onion router enabling Internet anonymity by thwarting network traffic analysis";
+    longDescription=''
+     Tor protects you by bouncing your communications around a distributed 
+     network of relays run by volunteers all around the world: it prevents 
+     somebody watching your Internet connection from learning what sites you 
+     visit, and it prevents the sites you visit from learning your physical 
+     location. Tor works with many of your existing applications, including 
+     web browsers, instant messaging clients, remote login, and other 
+     applications based on the TCP protocol. 
+    '';
+    license="bsd";
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45cb314c808..8f9873d6b27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1695,6 +1695,10 @@ let
     inherit (xlibs) libX11 libXext;
   };
 
+  tor = import ../tools/security/tor {
+    inherit fetchurl stdenv libevent openssl zlib;
+  };
+
   ttf2pt1 = import ../tools/misc/ttf2pt1 {
     inherit fetchurl stdenv perl freetype;
   };