diff --git a/flake.nix b/flake.nix
index 63d0d74..364ef3c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,6 +51,9 @@
         poe-sidekick-web = final: prev: {
           inherit (self.packages.${prev.system}) poe-sidekick-web;
         };
+        forgejo-mcp = final: prev: {
+          inherit (self.packages.${prev.system}) forgejo-mcp;
+        };
       };
 
       formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree);
@@ -77,6 +80,7 @@
           noita-entangled-worlds = pkgs.callPackage ./pkgs/noita-entangled-worlds { };
           poe-sidekick = pkgs.callPackage ./pkgs/poe-sidekick { };
           poe-sidekick-web = pkgs.callPackage ./pkgs/poe-sidekick/web.nix { };
+          forgejo-mcp = pkgs.callPackage ./pkgs/forgejo-mcp { };
         }
       );
     };
diff --git a/pkgs/forgejo-mcp/default.nix b/pkgs/forgejo-mcp/default.nix
new file mode 100644
index 0000000..c7db377
--- /dev/null
+++ b/pkgs/forgejo-mcp/default.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitea,
+}:
+
+buildGoModule rec {
+  pname = "forgejo-mcp";
+  version = "2.14.0";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "goern";
+    repo = "forgejo-mcp";
+    tag = "v${version}";
+    hash = "sha256-jjwzc9bnuOG5j9frOGmJYv7oOnXRpns8pknonDezHGQ=";
+  };
+
+  vendorHash = "sha256-j5o/FZBowQvcatw14Fvs/8CTM5ZtQR6kwlroctaeKuM=";
+
+  meta = {
+    description = "Model Context Protocol server and CLI for interacting with the Forgejo API";
+    homepage = "https://codeberg.org/goern/forgejo-mcp";
+    license = lib.licenses.mit;
+    mainProgram = "forgejo-mcp";
+  };
+}