diff --git a/pkgs/by-name/ze/zeroclaw/package.nix b/pkgs/by-name/ze/zeroclaw/package.nix
new file mode 100644
index 000000000000..1d24f1e92816
--- /dev/null
+++ b/pkgs/by-name/ze/zeroclaw/package.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  callPackage,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  protobuf,
+  sqlite,
+  writableTmpDirAsHomeHook,
+  gitMinimal,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "zeroclaw";
+  version = "0.1.7";
+
+  src = fetchFromGitHub {
+    owner = "zeroclaw-labs";
+    repo = "zeroclaw";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-D4/2h7TlOwAU4tl1xcdULRfO21KmP+zLlqQ8DzLqnjQ=";
+  };
+
+  postPatch =
+    let
+      zeroclaw-web = callPackage ./zeroclaw-web { inherit (finalAttrs) version; };
+    in
+    ''
+      mkdir -p web
+      ln -s ${zeroclaw-web} web/dist
+    '';
+
+  cargoHash = "sha256-sbC+fdMzjrx0dF5zHBHzMgZeIPQth1oXNqilooVZF8s=";
+
+  nativeBuildInputs = [
+    pkg-config
+    protobuf
+  ];
+
+  buildInputs = [
+    sqlite
+  ];
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+    gitMinimal
+  ];
+
+  checkFlags = [
+    "--skip=memory::lucid::tests::failure_cooldown_avoids_repeated_lucid_calls"
+    "--skip=memory::lucid::tests::recall_handles_lucid_cold_start_delay_within_timeout"
+    "--skip=memory::lucid::tests::recall_merges_lucid_and_local_results"
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  meta = {
+    description = "Fast, small, and fully autonomous AI assistant infrastructure — deploy anywhere, swap anything";
+    homepage = "https://github.com/zeroclaw-labs/zeroclaw";
+    changelog = "https://github.com/zeroclaw-labs/zeroclaw/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "zeroclaw";
+  };
+})
diff --git a/pkgs/by-name/ze/zeroclaw/zeroclaw-web/default.nix b/pkgs/by-name/ze/zeroclaw/zeroclaw-web/default.nix
new file mode 100644
index 000000000000..0eccd8c67b49
--- /dev/null
+++ b/pkgs/by-name/ze/zeroclaw/zeroclaw-web/default.nix
@@ -0,0 +1,29 @@
+{
+  fetchFromGitHub,
+  buildNpmPackage,
+  version,
+  ...
+}:
+buildNpmPackage (finalAttrs: {
+  pname = "zeroclaw-web";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "zeroclaw-labs";
+    repo = "zeroclaw";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-D4/2h7TlOwAU4tl1xcdULRfO21KmP+zLlqQ8DzLqnjQ=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/web";
+
+  npmDepsHash = "sha256-H3extDaq4DgNYTUcw57gqwVWc3aPCWjIJEVYRMzdFdM=";
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r dist $out
+
+    runHook postInstall
+  '';
+})