diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index 3c10f4cc5716..eade75043d16 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -8,22 +8,24 @@
   gdb,
   libpfm,
   makeWrapper,
+  nix-update-script,
   pkg-config,
   procps,
   python3,
   which,
   zlib,
+  zstd,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "5.8.0";
+  version = "5.9.0";
   pname = "rr";
 
   src = fetchFromGitHub {
-    owner = "mozilla";
+    owner = "rr-debugger";
     repo = "rr";
     rev = finalAttrs.version;
-    hash = "sha256-FudAAkWIe6gv4NYFoe9E0hlgTM70lymBE5Fw/vbehps=";
+    hash = "sha256-o+HXrgGXdsvjlNh70qsXRtp2yXOiZIT30ejfs1KEaqE=";
   };
 
   postPatch = ''
@@ -62,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     procps
     python3
     zlib
+    zstd
   ];
 
   cmakeFlags = [
@@ -85,6 +88,8 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix PATH ":" "${lib.makeBinPath [ gdb ]}";
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     homepage = "https://rr-project.org/";
     description = "Records nondeterministic executions and debugs them deterministically";
@@ -102,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       pierron
       thoughtpolice
+      lf-
     ];
     platforms = [
       "aarch64-linux"