diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 454ee5bad240..e148b8b56120 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, boost, zlib}:
 
 stdenv.mkDerivation {
-  name = "monotone-0.38";
+  name = "monotone-0.40";
   src = fetchurl {
     url = http://monotone.ca/downloads/0.40/monotone-0.40.tar.gz;
     sha256 = "0zs1zxvdn0m27w1830qbbh5vqk948hkpdkxwnlghszcbzz49151h";
diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix
new file mode 100644
index 000000000000..82b841f964a7
--- /dev/null
+++ b/pkgs/applications/version-management/viewmtn/0.10.nix
@@ -0,0 +1,45 @@
+
+args : with args; 
+rec {
+  src = fetchurl {
+    url = http://grahame.angrygoats.net/source/viewmtn/viewmtn-0.10.tgz;
+    sha256 = "1c6y708xaf6pds1r6l00q7vpgfagfbnf95kqj168vw3xr3l8a4yx";
+  };
+
+  buildInputs = [python flup highlight monotone 
+    cheetahTemplate makeWrapper graphviz which];
+  configureFlags = [];
+  makeFlags = ["PREFIX=$out"];
+
+  /* doConfigure should be specified separately */
+  phaseNames = ["doInstall" 
+    (doPatchShebangs "$out/bin")
+    (makeManyWrappers "$out/bin/*" 
+      (pythonWrapperArguments + preservePathWrapperArguments)) 
+  ];
+      
+  doInstall = FullDepEntry (''
+    for i in dot mtn highlight; do 
+        sed -e "s@/usr/bin/$i@$(which $i)@" -i config.py.example
+    done
+    sed -e "s@'templates/'@'$out/share/viewmtn/templates/'@" -i config.py.example
+
+    fullOut=$(toPythonPath $out)
+    
+    ensureDir $fullOut
+    ensureDir $out/bin
+    ensureDir $out/share/viewmtn
+    
+    cp -r * $fullOut
+    cp $fullOut/viewmtn.py $out/bin
+    
+    ln -s $fullOut/{AUTHORS,ChangeLog,INSTALL,LICENSE,README,TODO,config.py.example} $out/share/viewmtn
+    ln -s $fullOut/templates $out/share/viewmtn/
+    ln -s $fullOut/static $out/share/viewmtn/
+  '') ["minInit" "defEnsureDir" "addInputs" "doUnpack"];
+
+  name = "viewmtn-" + version;
+  meta = {
+    description = "Monotone web interface";
+  };
+}
diff --git a/pkgs/development/python-modules/flup/r2311.nix b/pkgs/development/python-modules/flup/r2311.nix
new file mode 100644
index 000000000000..1334a7e7539b
--- /dev/null
+++ b/pkgs/development/python-modules/flup/r2311.nix
@@ -0,0 +1,18 @@
+args : with args; 
+rec {
+  src = fetchurl {
+    url = http://www.saddi.com/software/flup/dist/flup-r2311.tar.gz;
+    sha256 = "15wyn6d6wla1ag91yxmlh9b4m0w1i0c2lm8ka4qfv4ijqcqakdx3";
+  };
+
+  buildInputs = [python setuptools];
+  configureFlags = [];
+
+  /* doConfigure should be specified separately */
+  phaseNames = ["addInputs" "createPythonInstallationTarget" (doDump "0") "installPythonPackage"];
+      
+  name = "flup-" + version;
+  meta = {
+    description = "FastCGI Python module set";
+  };
+}
diff --git a/pkgs/development/python-modules/setuptools/0.6c8.nix b/pkgs/development/python-modules/setuptools/0.6c8.nix
new file mode 100644
index 000000000000..d8149f5514a5
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools/0.6c8.nix
@@ -0,0 +1,19 @@
+
+args : with args; 
+rec {
+  src = fetchurl {
+    url = http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c8.tar.gz;
+    sha256 = "0dry431lkaqqmgvka0rhnw54ljf1yx0npzh7r81z2ylcrn27lrln";
+  };
+
+  buildInputs = [python];
+  configureFlags = [];
+
+  /* doConfigure should be specified separately */
+  phaseNames = ["createPythonInstallationTarget" "installPythonPackage"];
+      
+  name = "setuptools-" + version;
+  meta = {
+    description = "Installation utilities for Python packages";
+  };
+}
diff --git a/pkgs/tools/text/highlight/2.6.10.nix b/pkgs/tools/text/highlight/2.6.10.nix
new file mode 100644
index 000000000000..675a996445f4
--- /dev/null
+++ b/pkgs/tools/text/highlight/2.6.10.nix
@@ -0,0 +1,20 @@
+
+args : with args; 
+rec {
+  src = fetchurl {
+    url = http://www.andre-simon.de/zip/highlight-2.6.10.tar.bz2;
+    sha256 = "18f2ki9pajxlp0aq4ingxj7m0cp7wlbc40xm25pnxc1yis9vlira";
+  };
+
+  buildInputs = [getopt];
+  configureFlags = [];
+  makeFlags = ["PREFIX=$out"];
+
+  /* doConfigure should be specified separately */
+  phaseNames = ["doMakeInstall"];
+      
+  name = "highlight-" + version;
+  meta = {
+    description = "Source code highlighting tool";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2380eca4bddc..50b0c5b31fb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -503,7 +503,8 @@ let pkgs = rec {
   };
 
   cheetahTemplate = builderDefsPackage (selectVersion ../tools/text/cheetah-template "2.0.1") {
-    inherit python makeWrapper;
+    inherit makeWrapper;
+    python = python25;
   } null;
 
   chkrootkit = import ../tools/security/chkrootkit {
@@ -739,6 +740,10 @@ let pkgs = rec {
     inherit fetchurl stdenv ocaml;
   };
 
+  highlight = builderDefsPackage (selectVersion ../tools/text/highlight "2.6.10") {
+    inherit getopt;
+  } null;
+
   /*
   hyppocampusFun = lib.sumArgs ( selectVersion ../tools/misc/hyppocampus "0.3rc1") {
     inherit builderDefs stdenv fetchurl libdbi libdbiDrivers fuse
@@ -1653,6 +1658,13 @@ let pkgs = rec {
     inherit (gnome) gtk libgnomecanvas glib;
   } null;
 
+  viewMtn = builderDefsPackage (selectVersion ../applications/version-management/viewmtn "0.10")
+  {
+    inherit monotone flup cheetahTemplate highlight ctags 
+      makeWrapper graphviz which;
+    python = python25;
+  } null;
+
   nasm = import ../development/compilers/nasm {
     inherit fetchurl stdenv;
   };
@@ -4202,6 +4214,13 @@ let pkgs = rec {
     inherit fetchurl stdenv python db4;
   };
 
+  flup = builderDefsPackage (selectVersion ../development/python-modules/flup "r2311") 
+  (let python=python25; in 
+  {
+    inherit python;
+    setuptools = setuptools.meta.function {inherit python;} null;
+  }) null;
+
   pil = import ../development/python-modules/pil {
     inherit fetchurl stdenv python zlib libtiff libjpeg freetype;
   };
@@ -4253,6 +4272,10 @@ let pkgs = rec {
     inherit fetchurl stdenv python makeWrapper;
   };
 
+  setuptools = builderDefsPackage (selectVersion ../development/python-modules/setuptools "0.6c8") {
+    python = python25;
+  } null;
+
   wxPython = wxPython26;
 
   wxPython26 = import ../development/python-modules/wxPython/2.6.nix {
diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix
index 837ca0c0f8b7..112f6b5c2ffe 100644
--- a/pkgs/top-level/builder-defs.nix
+++ b/pkgs/top-level/builder-defs.nix
@@ -307,10 +307,15 @@ args: with args; with stringsWithDeps; with lib;
 
 	wrapBinContentsPython = (makeManyWrappers 
 	  ''$out/bin/*'' 
-	  (''--prefix PYTHONPATH : $(toPythonPath $out)'' +
-	  ''''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH}'')
+	  pythonWrapperArguments
 	);
 
+	pythonWrapperArguments = 
+	  (''--prefix PYTHONPATH : $(toPythonPath $out)'' +
+	  ''''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH}'');
+
+	preservePathWrapperArguments = ''''${PATH:+ --prefix PATH : $PATH }'';
+
 	doPropagate = FullDepEntry ("
 		ensureDir \$out/nix-support
 		echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs
@@ -507,4 +512,8 @@ args: with args; with stringsWithDeps; with lib;
      patchShebangFun;
    '') ["minInit"];
 
+   createPythonInstallationTarget = FullDepEntry (''
+     ensureDir $(toPythonPath $out)
+     export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out)
+   '') ["minInit" "addInputs" "defEnsureDir"];
 }) // args