diff --git a/pkgs/by-name/te/terraform-mcp-server/package.nix b/pkgs/by-name/te/terraform-mcp-server/package.nix
new file mode 100644
index 000000000000..785ca9579902
--- /dev/null
+++ b/pkgs/by-name/te/terraform-mcp-server/package.nix
@@ -0,0 +1,42 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+}:
+buildGoModule (finalAttrs: {
+  pname = "terraform-mcp-server";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "hashicorp";
+    repo = "terraform-mcp-server";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-HYiA0Mfp87czQShiXbS+y20yQzxTn0+hfM0M1kLFZFM=";
+  };
+
+  vendorHash = "sha256-m4J2WGcL0KB1InyciQEmLOSBw779/kagUOIkTwc4CE4=";
+
+  ldflags = [
+    "-X main.version=${finalAttrs.version}"
+    "-X main.commit=${finalAttrs.src.rev}"
+  ];
+
+  subPackages = [ "cmd/terraform-mcp-server" ];
+
+  meta = {
+    description = "Terraform Model Context Protocol (MCP) Server";
+    longDescription = ''
+      The Terraform MCP Server is a Go implementation of the Model Context
+      Protocol (MCP) server that provides seamless integration with Terraform
+      Registry APIs, enabling advanced automation and interaction capabilities
+      for developers and tools.
+
+      This server allows LLMs to interact with Terraform modules, providers,
+      and other Terraform Registry features through structured API interactions.
+    '';
+    homepage = "https://github.com/hashicorp/terraform-mcp-server";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ connerohnesorge ];
+    mainProgram = "terraform-mcp-server";
+  };
+})