diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9b1d6db67f16..ef9a34b768db 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -29384,6 +29384,14 @@
     github = "wamserma";
     githubId = 60148;
   };
+  wanderer = {
+    name = "Martin Becze";
+    email = "martin@becze.org";
+    matrix = "@null_radix:matrix.org";
+    github = "wanderer";
+    githubId = 158211;
+    keys = [ { fingerprint = "82CB 91F4 F3E4 04A5 DAB2  78E8 8B99 1293 8FF2 1020"; } ];
+  };
   wariuccio = {
     name = "Wariuccio";
     github = "wariuccio";
diff --git a/pkgs/by-name/an/anytype-cli/package.nix b/pkgs/by-name/an/anytype-cli/package.nix
new file mode 100644
index 000000000000..527f651eca3a
--- /dev/null
+++ b/pkgs/by-name/an/anytype-cli/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  tantivy-go,
+}:
+buildGoModule (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "anytype-cli";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "anyproto";
+    repo = "anytype-cli";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9jJ4FV4ASUrhUvW/lI4qs7AmK06OkPfnD0+okl5blrs=";
+  };
+
+  vendorHash = "sha256-7J/nW4Jn2vdAs8sN+rV3wg6nV3JhtQrnLwlxNI0uja0=";
+  proxyVendor = true;
+
+  env.CGO_ENABLED = 1;
+  env.CGO_LDFLAGS = "-L${tantivy-go}/lib";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/anyproto/anytype-cli/core.Version=v${finalAttrs.version}"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Command-line interface for interacting with Anytype";
+    homepage = "https://github.com/anyproto/anytype-cli";
+    changelog = "https://github.com/anyproto/anytype-cli/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    mainProgram = "anytype-cli";
+    maintainers = with lib.maintainers; [
+      adda
+      wanderer
+    ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+})