diff --git a/pkgs/development/compilers/zig/shell-completions.nix b/pkgs/development/compilers/zig/shell-completions.nix
new file mode 100644
index 000000000000..74beb5f63d65
--- /dev/null
+++ b/pkgs/development/compilers/zig/shell-completions.nix
@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, installShellFiles
+}:
+
+stdenv.mkDerivation rec {
+  pname = "zig-shell-completions";
+  version = "unstable-2023-08-17";
+
+  src = fetchFromGitHub {
+    owner = "ziglang";
+    repo = "shell-completions";
+    rev = "de9f83166d792cce6a0524e63d2755952dd9872c";
+    hash = "sha256-92n41/AWbHYkXiBtbWw+hXZKJCE7KW9igd8cLSBQfHo=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    installShellCompletion --bash --name zig.bash _zig.bash
+    installShellCompletion --zsh --name _zig _zig
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/ziglang/shell-completions";
+    description = "Shell completions for the Zig compiler";
+    license = licenses.mit;
+    maintainers = with maintainers; [ aaronjheng ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53a837a6be1d..44ddc8b5c06c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25728,6 +25728,8 @@ with pkgs;
   };
   zig = zig_0_11;
 
+  zig-shell-completions = callPackage ../development/compilers/zig/shell-completions.nix { };
+
   zimlib = callPackage ../development/libraries/zimlib { };
 
   zita-convolver = callPackage ../development/libraries/audio/zita-convolver { };