diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index 875f71d5f9f..fee430a4067 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -192,4 +192,16 @@
     fullName = "zlib license";
     url = http://www.gzip.org/zlib/zlib_license.html;
   };
+
+  zpt20 = {
+    shortName = "ZPT2.0";
+    fullName = "Zope Public License 2.0";
+    url = "http://old.zope.org/Resources/License/ZPL-2.0";
+  };
+
+  zpt21 = {
+    shortName = "ZPT2.1";
+    fullName = "Zope Public License 2.1";
+    url = "http://old.zope.org/Resources/License/ZPL-2.1";
+  };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b6b519496f9..1823c3791b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -544,34 +544,30 @@ pythonPackages = python.modules // rec {
   # });
 
 
-  buildout = buildPythonPackage rec {
-    name = "buildout-${version}";
-    version = "1.7.0";
+  buildout = zc_buildout;
+  buildout152 = zc_buildout152;
+
+  zc_buildout = zc_buildout171;
+  zc_buildout171 = buildPythonPackage rec {
+    name = "zc.buildout-1.7.1";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.buildout/zc.${name}.tar.gz";
-      md5 = "4e3b521600e475c56a0a66459a5fc7bb";
+      url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz";
+      md5 = "8834a21586bf2be53dc412002241a996";
     };
 
-   # TODO: consider if this patch should be an option
-   # It makes buildout useful in a nix profile, but this alters the default functionality
-   patchPhase = ''
-     sed -i "s/return (stdlib, site_paths)/return (stdlib, sys.path)/g" src/zc/buildout/easy_install.py
-   '';
-
    meta = {
-      homepage = http://www.buildout.org/;
+      homepage = "http://www.buildout.org";
       description = "A software build and configuration system";
+      license = pkgs.lib.licenses.zpt21;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
-
-
-  buildout152 = buildPythonPackage rec {
-    name = "buildout-${version}";
-    version = "1.5.2";
+  zc_buildout152 = buildPythonPackage rec {
+    name = "zc.buildout-1.5.2";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.buildout/zc.${name}.tar.gz";
+      url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz";
       md5 = "87f7b3f8d13926c806242fd5f6fe36f7";
     };
 
@@ -582,8 +578,10 @@ pythonPackages = python.modules // rec {
    '';
 
    meta = {
-      homepage = http://www.buildout.org/;
+      homepage = "http://www.buildout.org";
       description = "A software build and configuration system";
+      license = pkgs.lib.licenses.zpt21;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };