diff --git a/pkgs/development/tools/kubeswitch/default.nix b/pkgs/development/tools/kubeswitch/default.nix
index 76aeeb2e94c8..aad4fb5318c7 100644
--- a/pkgs/development/tools/kubeswitch/default.nix
+++ b/pkgs/development/tools/kubeswitch/default.nix
@@ -1,4 +1,11 @@
-{ lib, buildGoModule, fetchFromGitHub, testers, kubeswitch }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  testers,
+  kubeswitch,
+  installShellFiles,
+}:
 
 buildGoModule rec {
   pname = "kubeswitch";
@@ -6,9 +13,9 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "danielfoehrKn";
-    repo = pname;
+    repo = "kubeswitch";
     rev = version;
-    sha256 = "sha256-zf7o41YYAppRge0EMXgIN8rI5Kco4/n7BJ90b/X6L1M=";
+    hash = "sha256-zf7o41YYAppRge0EMXgIN8rI5Kco4/n7BJ90b/X6L1M=";
   };
 
   vendorHash = null;
@@ -16,25 +23,30 @@ buildGoModule rec {
   subPackages = [ "cmd/main.go" ];
 
   ldflags = [
-    "-s" "-w"
+    "-s"
+    "-w"
     "-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.version=${version}"
     "-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.buildDate=1970-01-01"
-
   ];
 
-  passthru.tests.version = testers.testVersion {
-    package = kubeswitch;
-  };
+  nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
-    mv $out/bin/main $out/bin/switch
+    mv $out/bin/main $out/bin/switcher
+    for shell in bash zsh fish; do
+      $out/bin/switcher --cmd switcher completion $shell > switcher.$shell
+      installShellCompletion --$shell switcher.$shell
+    done
   '';
 
-  meta = with lib; {
-    description = "The kubectx for operators";
-    license = licenses.asl20;
+  passthru.tests.version = testers.testVersion { package = kubeswitch; };
+
+  meta = {
+    changelog = "https://github.com/danielfoehrKn/kubeswitch/releases/tag/${version}";
+    description = "The kubectx for operators, a drop-in replacement for kubectx";
+    license = lib.licenses.asl20;
     homepage = "https://github.com/danielfoehrKn/kubeswitch";
-    maintainers = with maintainers; [ bryanasdev000 ];
-    mainProgram = "switch";
+    maintainers = with lib.maintainers; [ bryanasdev000 ];
+    mainProgram = "switcher";
   };
 }