diff --git a/pkgs/tools/networking/p2p/bit-tornado/default.nix b/pkgs/tools/networking/p2p/bit-tornado/default.nix
index 98c53fdc3a7..640ffad9e52 100644
--- a/pkgs/tools/networking/p2p/bit-tornado/default.nix
+++ b/pkgs/tools/networking/p2p/bit-tornado/default.nix
@@ -1,4 +1,5 @@
-{stdenv,fetchurl,python,wxPython26}:
+{stdenv,fetchurl,python, wxPython, makeWrapper, 
+  ssl}:
 stdenv.mkDerivation {
   name = "bit-tornado";
 
@@ -7,14 +8,15 @@ stdenv.mkDerivation {
     sha256 = "1q6rapidnizy8wawasirgyjl9s4lrm7mm740mc5q5sdjyl5svrnr";
   };
 
-  buildInputs = [python];
+  buildInputs = [python wxPython makeWrapper ssl];
 
-  buildPhase = " ";
+  buildPhase = '' '';
   installPhase = ''
     python setup.py install --prefix=$out ;
-    echo 'export PYTHONPATH=$PYTHONPATH:'$out'/lib/${python.libPrefix}/site-packages:${wxPython26}/lib/${python.libPrefix}/site-packages:${wxPython26}/lib/${python.libPrefix}/site-packages/wx-2.6-gtk2-unicode
-    python `which btdownloadgui.py` --ipv6_enabled 1 --ipv6_binds_v4 0 "$@";' > $out/bin/bittornado ; 
-    chmod a+rx $out/bin/bittornado;
+    for i in $(cd $out/bin && ls); do
+        wrapProgram $out/bin/$i \
+            --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" 
+    done
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c38c117e9d0..a7a4ff99767 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -446,7 +446,9 @@ let
     gui = true;
   };
 
-  bittornado = callPackage ../tools/networking/p2p/bit-tornado { };
+  bittornado = callPackage ../tools/networking/p2p/bit-tornado { 
+    inherit (pythonPackages) ssl;
+  };
 
   blueman = callPackage ../tools/bluetooth/blueman {
     inherit (pythonPackages) notify;