diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1c5635765bb4..22e04af4e1f6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15161,6 +15161,12 @@
     githubId = 1391883;
     name = "Tom Hall";
   };
+  thubrecht = {
+    email = "tom@hubrecht.ovh";
+    github = "Tom-Hubrecht";
+    githubId = 26650391;
+    name = "Tom Hubrecht";
+  };
   Thunderbottom = {
     email = "chinmaydpai@gmail.com";
     github = "Thunderbottom";
diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/development/tools/djhtml/default.nix
new file mode 100644
index 000000000000..a014c9722f2e
--- /dev/null
+++ b/pkgs/development/tools/djhtml/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, pythonOlder
+}:
+buildPythonApplication rec {
+  pname = "djhtml";
+  version = "3.0.5";
+
+  format = "setuptools";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "rtts";
+    repo = pname;
+    rev = version;
+    hash = "sha256-m13lw1x+URAYuDc0gXRIxfRnd6kQxeAuLDqYXeOgQE0=";
+  };
+
+  pythonImportsCheck = [ "djhtml" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/rtts/djhtml";
+    description = "Django/Jinja template indenter";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ thubrecht ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c2fa3be3147..7554522f6370 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -494,6 +494,8 @@ with pkgs;
 
   dinghy = with python3Packages; toPythonApplication dinghy;
 
+  djhtml = callPackage ../development/tools/djhtml { };
+
   deadcode = callPackage ../development/tools/deadcode { };
 
   deadnix = callPackage ../development/tools/deadnix { };