diff --git a/pkgs/by-name/au/autotools-language-server/package.nix b/pkgs/by-name/au/autotools-language-server/package.nix
index 6eed1550b31e..020a5d04f58d 100644
--- a/pkgs/by-name/au/autotools-language-server/package.nix
+++ b/pkgs/by-name/au/autotools-language-server/package.nix
@@ -1,44 +1,20 @@
 {
   lib,
-  python311,
+  python3,
   fetchFromGitHub,
-  fetchpatch,
 }:
 
-let
-  python3 = python311.override {
-    self = python3;
-    packageOverrides = _: super: {
-      tree-sitter = super.tree-sitter_0_21;
-      lsp-tree-sitter = super.lsp-tree-sitter.overridePythonAttrs (__: {
-        pythonRelaxDeps = [ "tree-sitter" ];
-      });
-    };
-  };
-in
 python3.pkgs.buildPythonApplication rec {
   pname = "autotools-language-server";
-  version = "0.0.19";
+  version = "0.0.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Freed-Wu";
     repo = "autotools-language-server";
     tag = version;
-    hash = "sha256-V0EOV1ZmeC+4svc2fqV6AIiL37dkrxUJAnjywMZcENw=";
+    hash = "sha256-PvaEcdvUE8QpxKuW65RL8SgDl/RM/C3HTEK3v+YA73c=";
   };
-  patches = [
-    # Right before the release, upstream decided to replace the
-    # tree-sitter-languages dependency with tree-sitter-make, which is yanked
-    # from some reason. Hopefully upstream will fix this dependency a bit
-    # better in the next release. See also:
-    # https://github.com/Freed-Wu/autotools-language-server/commit/f149843becfcfd6b2bb4a98eb1f3984c01d5fd33#r142659163
-    (fetchpatch {
-      url = "https://github.com/Freed-Wu/autotools-language-server/commit/f149843becfcfd6b2bb4a98eb1f3984c01d5fd33.patch";
-      hash = "sha256-TrzHbfR6GYAEqDIFiCqSX2+Qv4JeFJ5faiKJhNYojf0=";
-      revert = true;
-    })
-  ];
 
   build-system = [
     python3.pkgs.setuptools-generate
@@ -46,7 +22,7 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   dependencies = with python3.pkgs; [
-    tree-sitter-languages
+    tree-sitter-make
     lsp-tree-sitter
   ];
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/lsp-tree-sitter/default.nix b/pkgs/development/python-modules/lsp-tree-sitter/default.nix
index 9b8b0cf874cc..d702e2be6369 100644
--- a/pkgs/development/python-modules/lsp-tree-sitter/default.nix
+++ b/pkgs/development/python-modules/lsp-tree-sitter/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "lsp-tree-sitter";
-  version = "0.0.16";
+  version = "0.0.17";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "neomutt";
     repo = "lsp-tree-sitter";
     tag = version;
-    hash = "sha256-nRzyVZFgb08M0I+xmhuX1LDwPsghlBLdZ2Ou8stKzk0=";
+    hash = "sha256-4DQzHdii2YS/Xg6AdT/kXC/8B88ZQaLgUf2oWoOthV8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/tree-sitter-make/default.nix b/pkgs/development/python-modules/tree-sitter-make/default.nix
new file mode 100644
index 000000000000..a91fa5fbd913
--- /dev/null
+++ b/pkgs/development/python-modules/tree-sitter-make/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  cargo,
+  rustPlatform,
+  rustc,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "tree-sitter-make";
+  version = "1.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tree-sitter-grammars";
+    repo = "tree-sitter-make";
+    rev = "v${version}";
+    hash = "sha256-WiuhAp9JZKLd0wKCui9MV7AYFOW9dCbUp+kkVl1OEz0=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    name = "${pname}-${version}";
+    hash = "sha256-RI/wBnapWdr4kYshx9d9iN9nB30bR91uQ063yqNy4aA=";
+  };
+
+  build-system = [
+    cargo
+    rustPlatform.cargoSetupHook
+    rustc
+    setuptools
+  ];
+
+  # There are no tests
+  doCheck = false;
+  pythonImportsCheck = [
+    "tree_sitter_make"
+  ];
+
+  meta = {
+    description = "Makefile grammar for tree-sitter";
+    homepage = "https://github.com/tree-sitter-grammars/tree-sitter-make";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 481a660c4f47..c73c7c7651c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16404,6 +16404,8 @@ self: super: with self; {
 
   tree-sitter-json = callPackage ../development/python-modules/tree-sitter-json { };
 
+  tree-sitter-make = callPackage ../development/python-modules/tree-sitter-make { };
+
   tree-sitter-languages = callPackage ../development/python-modules/tree-sitter-languages { };
 
   treelib = callPackage ../development/python-modules/treelib { };