diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 25f340886351..14a33afd8025 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5103,6 +5103,12 @@
     name = "Changsheng Wu";
     githubId = 2083950;
   };
+  connerohnesorge = {
+    email = "conneroisu@outlook.com";
+    github = "conneroisu";
+    githubId = 88785126;
+    name = "Conner Ohnesorge";
+  };
   conni2461 = {
     email = "simon-hauser@outlook.com";
     github = "Conni2461";
diff --git a/pkgs/by-name/gi/gitea-mcp-server/package.nix b/pkgs/by-name/gi/gitea-mcp-server/package.nix
new file mode 100644
index 000000000000..4313000fdb78
--- /dev/null
+++ b/pkgs/by-name/gi/gitea-mcp-server/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitea,
+}:
+buildGoModule (finalAttrs: {
+  pname = "gitea-mcp-server";
+  version = "0.2.0";
+
+  src = fetchFromGitea {
+    domain = "gitea.com";
+    owner = "gitea";
+    repo = "gitea-mcp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZUnpE25XIYzSwdEilzXnhqGR676iBQcR2yiT3jhJApc=";
+  };
+
+  vendorHash = "sha256-u9jIjrbDUhnaaeBET+pKQTKhaQLUeQvKOXSBfS0vMJM=";
+
+  subPackages = [ "." ];
+
+  doCheck = false; # no test
+
+  postInstall = ''
+    install -Dm644 README.md LICENSE -t $out/share/doc/gitea-mcp-server
+  '';
+
+  meta = {
+    description = "Gitea Model Context Protocol (MCP) Server";
+    longDescription = ''
+      The Gitea MCP Server is a Model Context Protocol (MCP) server that provides
+      seamless integration with Gitea APIs, enabling advanced automation and
+      interaction capabilities for developers and tools.
+
+      This server allows LLMs to interact with Gitea repositories, issues, pull
+      requests, and other Gitea features through structured API interactions.
+    '';
+    homepage = "https://gitea.com/gitea/gitea-mcp";
+    license = lib.licenses.mit;
+    mainProgram = "gitea-mcp";
+    maintainers = with lib.maintainers; [ connerohnesorge ];
+  };
+})