diff --git a/pkgs/development/python-modules/setuptools/0.6c8.nix b/pkgs/development/python-modules/setuptools/0.6c8.nix
deleted file mode 100644
index d8149f5514a5..000000000000
--- a/pkgs/development/python-modules/setuptools/0.6c8.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-
-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/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
new file mode 100644
index 000000000000..c94b6369f035
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -0,0 +1,37 @@
+{ fetchurl, stdenv, python, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "setuptools-0.6c9";
+
+  src = fetchurl {
+    url = "http://pypi.python.org/packages/source/s/setuptools/${name}.tar.gz";
+    sha256 = "1n5k6hf9nn69fnprgsnr9hdxzj2j6ir76qcy9d4b2v0v62bh86g6";
+  };
+
+  buildInputs = [ python makeWrapper ];
+
+  doCheck = true;
+
+  buildPhase     = "python setup.py build --build-base $out";
+  checkPhase     = "python setup.py test";
+
+  installPhase   = ''
+    ensureDir "$out/lib/python2.5/site-packages"
+
+    PYTHONPATH="$out/lib/python2.5/site-packages:$PYTHONPATH" \
+    python setup.py install --prefix="$out"
+
+    for i in "$out/bin/"*
+    do
+      wrapProgram "$i"                          \
+        --prefix PYTHONPATH ":"			\
+          "$out/lib/python2.5/site-packages"
+    done
+  '';
+
+  meta = {
+    description = "Utilities to facilitate the installation of Python packages";
+    homepage = http://pypi.python.org/pypi/setuptools;
+    licenses = [ "PSF" "ZPL" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f45364b865f6..d76224ed0210 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4312,8 +4312,8 @@ let
     inherit fetchurl stdenv python makeWrapper;
   };
 
-  setuptools = builderDefsPackage (selectVersion ../development/python-modules/setuptools "0.6c8") {
-    inherit python;
+  setuptools = import ../development/python-modules/setuptools {
+    inherit fetchurl stdenv python makeWrapper;
   };
 
   simplejson = import ../development/python-modules/simplejson {