diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b495525479fb..509d19091c1f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8424,6 +8424,12 @@
     name = "A Frederick Christensen";
     keys = [ { fingerprint = "5A49 F4F9 3EDC 21E9 B7CC  4E94 9EEF 4142 5355 8AC4"; } ];
   };
+  fayash = {
+    email = "akafayash@icloud.com";
+    name = "Fay Ash";
+    github = "yaoshiu";
+    githubId = 56054933;
+  };
   fazzi = {
     email = "faaris.ansari@proton.me";
     github = "fxzzi";
diff --git a/pkgs/by-name/mc/mcp-language-server/package.nix b/pkgs/by-name/mc/mcp-language-server/package.nix
new file mode 100644
index 000000000000..3bd9a71552ad
--- /dev/null
+++ b/pkgs/by-name/mc/mcp-language-server/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+}:
+buildGoModule rec {
+  pname = "mcp-language-server";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "isaacphi";
+    repo = "mcp-language-server";
+    rev = "v${version}";
+    hash = "sha256-T0wuPSShJqVW+CcQHQuZnh3JOwqUxAKv1OCHwZMr7KM=";
+  };
+
+  subPackages = [ "." ];
+
+  proxyVendor = true;
+
+  vendorHash = "sha256-niDJB3QhZjz9qIGSjUEcghRpEbPUgsSuK52ncZ21DS8=";
+
+  meta = {
+    description = "Model Context Protocol server to interact with language servers";
+    license = lib.licenses.bsd3;
+    homepage = "https://github.com/isaacphi/mcp-language-server";
+    mainProgram = "mcp-language-server";
+    maintainers = with lib.maintainers; [
+      fayash
+    ];
+  };
+}