diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix
index 01a6948e3cac..c01b42c64b83 100644
--- a/pkgs/development/python-modules/cheetah3/default.nix
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@@ -1,19 +1,33 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+}:
 
 buildPythonPackage rec {
-  pname = "Cheetah3";
-  version = "3.2.6.post2";
+  pname = "cheetah3";
+  version = "3.3.1";
+  format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "63157d7a00a273b59676b5be5aa817c75c37efc88478231f1a160f4cfb7f7878";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "CheetahTemplate3";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-op8CwYISD2Gfsh0Olr8H07yvaT1maKyizb/IN9ZHwmQ=";
   };
 
   doCheck = false; # Circular dependency
 
+  pythonImportsCheck = [
+    "Cheetah"
+  ];
+
   meta = with lib; {
-    homepage = "http://www.cheetahtemplate.org/";
     description = "A template engine and code generation tool";
+    homepage = "http://www.cheetahtemplate.org/";
+    changelog = "https://github.com/CheetahTemplate3/cheetah3/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ pjjw ];
   };