diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix
index f9e013028ab4..dc827ae9be80 100644
--- a/pkgs/servers/spicedb/default.nix
+++ b/pkgs/servers/spicedb/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  installShellFiles,
 }:
 
 buildGoModule rec {
@@ -23,6 +24,15 @@ buildGoModule rec {
 
   subPackages = [ "cmd/spicedb" ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installShellCompletion --cmd spicedb \
+      --bash <($out/bin/spicedb completion bash) \
+      --fish <($out/bin/spicedb completion fish) \
+      --zsh <($out/bin/spicedb completion zsh)
+  '';
+
   meta = with lib; {
     description = "Open source permission database";
     longDescription = ''
diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix
index db9cd4dcf984..ce2f30f3747c 100644
--- a/pkgs/servers/spicedb/zed.nix
+++ b/pkgs/servers/spicedb/zed.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  installShellFiles,
 }:
 
 buildGoModule rec {
@@ -23,6 +24,15 @@ buildGoModule rec {
     export NO_COLOR=true
   '';
 
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installShellCompletion --cmd zed \
+      --bash <($out/bin/zed completion bash) \
+      --fish <($out/bin/zed completion fish) \
+      --zsh <($out/bin/zed completion zsh)
+  '';
+
   meta = with lib; {
     description = "Command line for managing SpiceDB";
     mainProgram = "zed";