diff --git a/pkgs/tools/networking/bittorrent/builder.sh b/pkgs/tools/networking/bittorrent/builder.sh
index 418e011e486b..c9114a785007 100644
--- a/pkgs/tools/networking/bittorrent/builder.sh
+++ b/pkgs/tools/networking/bittorrent/builder.sh
@@ -1,16 +1,25 @@
-buildinputs="$python $wxPython"
+buildInputs="$python $wxPython"
 . $stdenv/setup
 
-tar xvfz $src
-cd BitTorrent-*
-python setup.py build install --prefix=$out
+buildPhase=buildPhase
+buildPhase() {
+    python setup.py build
+}
 
-mv $out/bin $out/bin-orig
-mkdir $out/bin
-for i in $(cd $out/bin-orig && ls); do
-  cat > $out/bin/$i <<EOF
+installPhase=installPhase
+installPhase() {
+    python setup.py install --prefix=$out
+
+    # Create wrappers that set the environment correctly.
+    mv $out/bin $out/bin-orig
+    mkdir $out/bin
+    for i in $(cd $out/bin-orig && ls); do
+        cat > $out/bin/$i <<EOF
 #! /bin/sh
 PYTHONPATH=$out/lib/python2.3/site-packages:$wxPython/lib/python2.3/site-packages exec $out/bin-orig/$i "\$@"
 EOF
-  chmod +x $out/bin/$i
-done
\ No newline at end of file
+        chmod +x $out/bin/$i
+    done
+}
+
+genericBuild
\ No newline at end of file
diff --git a/pkgs/tools/networking/bittorrent/default.nix b/pkgs/tools/networking/bittorrent/default.nix
index 13711226950b..c4b19c9f807e 100644
--- a/pkgs/tools/networking/bittorrent/default.nix
+++ b/pkgs/tools/networking/bittorrent/default.nix
@@ -3,12 +3,12 @@
 assert wxPython.python.zlibSupport;
 
 stdenv.mkDerivation {
-  name = "bittorrent-3.3";
+  name = "bittorrent-3.4.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://bitconjurer.org/BitTorrent/BitTorrent-3.3.tar.gz;
-    md5 = "1ecf1fc40b4972470313f9ae728206e8";
+    url = http://heanet.dl.sourceforge.net/sourceforge/bittorrent/BitTorrent-3.4.2.tar.gz;
+    md5 = "b854f25a33289565bcaeaded04955c1a";
   };
-  python = wxPython.python;
   inherit wxPython;
+  inherit (wxPython) python;
 }