diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix
index 68b4218a60e0..af9f7c1aba2c 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix
@@ -1,4 +1,10 @@
-{ buildGoModule, callPackage }:
+{
+  buildGoModule,
+  callPackage,
+  installShellFiles,
+  lib,
+  stdenv,
+}:
 let
   common = callPackage ./common.nix { };
 in
@@ -8,13 +14,23 @@ buildGoModule {
     version
     src
     ldflags
-    postInstall
     vendorHash
     ;
 
   subPackages = "cmd/cli";
 
+  nativeBuildInputs = [ installShellFiles ];
+
   env.CGO_ENABLED = 0;
+  postInstall = ''
+    ${common.postInstall}
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd woodpecker-cli \
+      --bash <($out/bin/woodpecker-cli completion bash) \
+      --fish <($out/bin/woodpecker-cli completion fish ) \
+      --zsh <($out/bin/woodpecker-cli completion zsh)
+  '';
 
   meta = common.meta // {
     description = "Command line client for the Woodpecker Continuous Integration server";
diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index e2c7da621116..daa6598b0184 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 let
-  version = "3.9.0";
-  srcHash = "sha256-Ymg6nJr83jt2EAv/p1B1wmZv3jvpx/3xRVRii3S1cNU=";
+  version = "3.10.0";
+  srcHash = "sha256-Z9EGm14q9DySZ0lgw/wwam3NjvicltWBkVJ3cwi/eds=";
   # The tarball contains vendored dependencies
   vendorHash = null;
 in