diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
new file mode 100644
index 00000000000..83cfee07e66
--- /dev/null
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+stdenv.mkDerivation rec {
+  pname = "torsocks";
+  name = "${pname}-${version}";
+  version = "1.0-epsilon";
+  
+  src = fetchurl {
+    url = "http://${pname}.googlecode.com/files/${name}.tar.gz";
+    sha256 = "0508i4q9gm0rrav018z1jn4as5if3qrfdng6dmmzgs324hvdgap5";
+  };
+
+  preConfigure = ''
+      export configureFlags="$configureFlags --libdir=$out/lib"
+  '';
+
+  meta = {
+    description = "use socks-friendly applications with Tor";
+    homepage = http://code.google.com/p/torsocks/;
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e4219af066..60323cb28c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1201,6 +1201,8 @@ let
 
   tor = callPackage ../tools/security/tor { };
 
+  torsocks = callPackage ../tools/security/tor/torsocks.nix { };
+
   ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
   ttf2pt1_cl_pdf = callPackage ../tools/misc/ttf2pt1 { };