diff --git a/pkgs/applications/version-management/tailor/0.9.31.nix b/pkgs/applications/version-management/tailor/0.9.31.nix
index e32326782b49..bd4dced82657 100644
--- a/pkgs/applications/version-management/tailor/0.9.31.nix
+++ b/pkgs/applications/version-management/tailor/0.9.31.nix
@@ -5,11 +5,11 @@ rec {
     sha256 = "1apzd6mfmhgmxffzgzwsr17gnyqj6bycn783l9105cihsfcv9v3j";
   };
 
-  buildInputs = [python];
+  buildInputs = [python makeWrapper];
   configureFlags = [];
 
   /* doConfigure should be specified separately */
-  phaseNames = ["installPythonPackage"];
+  phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
       
   name = "tailor-" + version;
   meta = {
diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index a5bbed7c0d0d..10dc584e921e 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "samba-3.0.28a";
+  name = "samba-3.0.30";
 
   src = fetchurl {
-    url = http://us3.samba.org/samba/ftp/stable/samba-3.0.28a.tar.gz;
-    sha256 = "1pnrh4qlapsqgdrzq4v5vxv622wcxghi5cp0n4f87c8pc2rfrjcx";
+    url = http://www.samba.org/samba/ftp/stable/samba-3.0.30.tar.gz;
+    sha256 = "0lzs53424fblg9g6z3nsan3dxi3bnn5h4zs31ji2bavai4xrsy51";
   };
 
   buildInputs = [readline pam openldap kerberos popt iniparser libunwind fam];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92b103a28b26..236b4a157699 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4138,6 +4138,15 @@ let pkgs = rec {
     propagatedBuildInputs = [];
   };
 
+  perlYAML = import ../development/perl-modules/generic perl {
+    name = "YAML-0.66";
+    src = fetchurl {
+      url = http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-0.66.tar.gz;
+      sha256 = "1pcjf6y3l88ypa52mkk349jglabm53mhxda4p5awc1jl67lx3ngw";
+    };
+    propagatedBuildInputs = [];
+  };
+
   perlYAMLSyck = import ../development/perl-modules/generic perl {
     name = "YAML-Syck-1.04";
     src = fetchurl {
@@ -6298,6 +6307,7 @@ let pkgs = rec {
 
   tailor = builderDefsPackage (selectVersion ../applications/version-management/tailor "0.9.31") {
     python = python25;
+    inherit makeWrapper;
   } null;
 
   /* does'nt work yet i686-linux only (32bit version)
diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix
index b847a99c141d..e01699767685 100644
--- a/pkgs/top-level/builder-defs.nix
+++ b/pkgs/top-level/builder-defs.nix
@@ -305,6 +305,12 @@ args: with args; with stringsWithDeps; with lib;
 	  done
 	'') ["minInit" "addInputs" "defEnsureDir"];
 
+	wrapBinContentsPython = (makeManyWrappers 
+	  ''$out/bin/*'' 
+	  (''--prefix PYTHONPATH : $(toPythonPath $out)'' +
+	  ''''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH}'')
+	);
+
 	doPropagate = FullDepEntry ("
 		ensureDir \$out/nix-support
 		echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs