diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix
index e0ced9e2a8f8..dbf32808f941 100644
--- a/pkgs/applications/networking/cluster/kubetail/default.nix
+++ b/pkgs/applications/networking/cluster/kubetail/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchFromGitHub, lib, ... }:
+{ stdenv, fetchFromGitHub, lib, installShellFiles, makeWrapper, kubectl }:
 
 stdenv.mkDerivation rec {
   pname = "kubetail";
-  version = "1.6.13";
+  version = "1.6.16";
 
   src = fetchFromGitHub {
     owner = "johanhaleby";
     repo = "kubetail";
     rev = version;
-    sha256 = "sha256-EkOewNInzEEEgMOffYoRaKwhgYuBXgHaCkVgWg2mIDE=";
+    sha256 = "sha256-kkbhhAaiKP01LR7F5JVMgy6Ujji8JDc+Aaho1vft3XQ=";
   };
 
+  nativeBuildInputs = [ installShellFiles makeWrapper ];
+
   installPhase = ''
-    install -Dm755 kubetail                 "$out/bin/kubetail"
-    install -Dm755 completion/kubetail.bash "$out/share/bash-completion/completions/kubetail"
-    install -Dm755 completion/kubetail.fish "$out/share/fish/vendor_completions.d/kubetail.fish"
-    install -Dm755 completion/kubetail.zsh  "$out/share/zsh/site-functions/_kubetail"
+    install -Dm755 kubetail "$out/bin/kubetail"
+    wrapProgram $out/bin/kubetail --prefix PATH : ${lib.makeBinPath [ kubectl ]}
+
+    installShellCompletion completion/kubetail.{bash,fish,zsh}
   '';
 
   meta = with lib; {