diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index ef2b2159169f..d80054e05535 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -1,16 +1,17 @@
-{stdenv, fetchurl, python, ZopeInterface}:
+{stdenv, fetchurl, python, ZopeInterface, makeWrapper}:
 
 stdenv.mkDerivation {
   name = "twisted-8.1.0";
-  
   src = fetchurl {
     url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
     sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
   };
-  
   buildInputs = [python];
-  
-  propagatedBuildInputs = [ZopeInterface];
-  
-  installPhase = "PYTHONPATH=$(toPythonPath $out):$PYTHONPATH; python ./setup.py install --prefix=$out";
+  propagatedBuildInputs = [ZopeInterface makeWrapper];
+  buildPhase = "true";
+  installCommand =
+  ''
+     python ./setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1
+     for n in $out/bin/*; do wrapProgram $n --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH:\$PYTHONPATH"; done
+  '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1e1f05e2479..34718f2cb245 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4602,7 +4602,7 @@ let
   };
 
   twisted = import ../development/python-modules/twisted {
-    inherit fetchurl stdenv python ZopeInterface;
+    inherit fetchurl stdenv python ZopeInterface makeWrapper;
   };
 
   ZopeInterface = import ../development/python-modules/ZopeInterface {