diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
new file mode 100644
index 00000000000..327a10f2491
--- /dev/null
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+, pytest, setuptools_scm, pytestrunner
+, six, cheroot, portend }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "CherryPy";
+  version = "11.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1037pvhab4my791vfzikm649ny52fj7x2q87cnncmbnqin6ghwan";
+  };
+
+  # wsgiserver.ssl_pyopenssl is broken on py3k.
+  doCheck = !isPy3k;
+  buildInputs = [ pytest setuptools_scm pytestrunner ];
+  propagatedBuildInputs = [ six cheroot portend ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.cherrypy.org";
+    description = "A pythonic, object-oriented HTTP framework";
+    license = licenses.mit.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3678e70e70..79c089c5b5a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2774,27 +2774,7 @@ in {
     };
   };
 
-
-  cherrypy = buildPythonPackage (rec {
-    name = "cherrypy-${version}";
-    version = "8.7.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/C/CherryPy/CherryPy-${version}.tar.gz";
-      sha256 = "cbf418bf46458a67eb841944f2d414c23bf59d090baf2a28704bd67243e6a79f";
-    };
-
-    # wsgiserver.ssl_pyopenssl is broken on py3k.
-    doCheck = !isPy3k;
-    buildInputs = with self; [ pytest setuptools_scm pytestrunner ];
-    propagatedBuildInputs = with self; [ six ];
-
-    meta = {
-      homepage = "http://www.cherrypy.org";
-      description = "A pythonic, object-oriented HTTP framework";
-    };
-  });
-
+  cherrypy = callPackage ../development/python-modules/cherrypy {};
 
   cjson = buildPythonPackage rec {
     name = "python-cjson-${version}";