diff --git a/pkgs/by-name/zs/zsh-abbr/package.nix b/pkgs/by-name/zs/zsh-abbr/package.nix
index c9e0e9de85f8..2f096fb4735f 100644
--- a/pkgs/by-name/zs/zsh-abbr/package.nix
+++ b/pkgs/by-name/zs/zsh-abbr/package.nix
@@ -6,13 +6,14 @@
 }:
 stdenv.mkDerivation rec {
   pname = "zsh-abbr";
-  version = "5.8.3";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner = "olets";
     repo = "zsh-abbr";
     rev = "v${version}";
-    hash = "sha256-Kl98S1S4Ds9TF3H1YOjwds38da++/5rpgO/oAfKwRrc=";
+    hash = "sha256-PWr8o0so2ZfQJkinkLRa4bFxZtw0Lgs7UXVWvd/rWF0";
+    fetchSubmodules = true;
   };
 
   strictDeps = true;
@@ -21,8 +22,11 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install zsh-abbr.plugin.zsh zsh-abbr.zsh -Dt $out/share/zsh/zsh-abbr/
-    install completions/_abbr -Dt $out/share/zsh/zsh-abbr/completions/
+    install *.zsh -Dt $out/share/zsh/zsh-abbr/
+    install completions/* -Dt $out/share/zsh/zsh-abbr/completions/
+
+    install zsh-job-queue/*.zsh -Dt $out/share/zsh/zsh-abbr/zsh-job-queue/
+    install zsh-job-queue/completions/* -Dt $out/share/zsh/zsh-abbr/zsh-job-queue/completions/
 
     # Required for `man` to find the manpage of abbr, since it looks via PATH
     installManPage man/man1/*