diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-language-server/package.nix
similarity index 68%
rename from pkgs/by-name/po/postgres-lsp/package.nix
rename to pkgs/by-name/po/postgres-language-server/package.nix
index 93ea5e8604b5..290bc26f02f7 100644
--- a/pkgs/by-name/po/postgres-lsp/package.nix
+++ b/pkgs/by-name/po/postgres-language-server/package.nix
@@ -3,22 +3,29 @@
   rustPlatform,
   fetchgit,
   rust-jemalloc-sys,
+  tree-sitter,
+  nodejs,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "postgres-lsp";
-  version = "0.15.0";
+  pname = "postgres-language-server";
+  version = "0.16.1";
 
   src = fetchgit {
     url = "https://github.com/supabase-community/postgres-language-server";
     tag = finalAttrs.version;
-    hash = "sha256-ZintjrSeNsYR6A8tlEfSetse7d79jgLdCpdu+sMe3Zk=";
+    hash = "sha256-zdFgfZ9GtZObn839kkAIT71bBt7YHs28qkAWlp3k7kw=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-x/Wbx3noH6YOQIis1sN8ylQApjhSy4/mrxX6jvZFs6A=";
+  cargoHash = "sha256-psgo5/tDHaQd0dkiD/3uhrKuxlOBLi/xG4x3gVPLZbw=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
+
+    # Required to build the custom tree-sitter grammar
+    # https://github.com/supabase-community/postgres-language-server/blob/main/crates/pgt_treesitter_grammar/grammar.js
+    tree-sitter
+    nodejs
   ];
 
   buildInputs = [
@@ -44,12 +51,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Tools and language server for Postgres";
-    homepage = "https://pgtools.dev";
+    homepage = "https://pg-language-server.com";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       figsoda
       myypo
     ];
-    mainProgram = "postgrestools";
+    mainProgram = "postgres-language-server";
   };
 })
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f40183e4d867..a2fe24a88240 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1214,6 +1214,7 @@ mapAliases {
   posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03
   postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19
+  postgres-lsp = lib.warnOnInstantiate "'postgres-lsp' has been renamed to 'postgres-language-server'" postgres-language-server; # Added 2025-10-28
   postgresql13JitPackages = throw "'postgresql13JitPackages' has been renamed to/replaced by 'postgresql13Packages'"; # Converted to throw 2025-10-27
   postgresql14JitPackages = throw "'postgresql14JitPackages' has been renamed to/replaced by 'postgresql14Packages'"; # Converted to throw 2025-10-27
   postgresql15JitPackages = throw "'postgresql15JitPackages' has been renamed to/replaced by 'postgresql15Packages'"; # Converted to throw 2025-10-27