diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index 0f0f40e00020..5a7c493e42b1 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -209,6 +209,11 @@ in
     kernelPackages = pkgs.linuxPackages;
   };
 
+  series_2_4 = makeZfsTest {
+    zfsPackage = pkgs.zfs_2_4;
+    kernelPackages = pkgs.linuxPackages;
+  };
+
   unstable = makeZfsTest {
     zfsPackage = pkgs.zfs_unstable;
     kernelPackages = pkgs.linuxPackages;
diff --git a/pkgs/os-specific/linux/zfs/2_4.nix b/pkgs/os-specific/linux/zfs/2_4.nix
new file mode 100644
index 000000000000..9874986076d7
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/2_4.nix
@@ -0,0 +1,34 @@
+{
+  callPackage,
+  lib,
+  nixosTests,
+  stdenv,
+  fetchpatch,
+  ...
+}@args:
+
+callPackage ./generic.nix args {
+  # You have to ensure that in `pkgs/top-level/linux-kernels.nix`
+  # this attribute is the correct one for this package.
+  kernelModuleAttribute = "zfs_2_4";
+
+  kernelMinSupportedMajorMinor = "4.18";
+  kernelMaxSupportedMajorMinor = "6.18";
+
+  # this package should point to the latest release.
+  version = "2.4.0";
+
+  tests = {
+    inherit (nixosTests.zfs) series_2_4;
+  }
+  // lib.optionalAttrs stdenv.isx86_64 {
+    inherit (nixosTests.zfs) installer;
+  };
+
+  maintainers = with lib.maintainers; [
+    adamcstephens
+    amarshall
+  ];
+
+  hash = "sha256-v78Tn1Im9h8Sjd4XACYesPOD+hlUR3Cmg8XjcJXOuwM=";
+}
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 119c2ca8ed41..5620143d9a67 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -16,14 +16,14 @@ callPackage ./generic.nix args {
   # IMPORTANT: Always use a tagged release candidate or commits from the
   # zfs-<version>-staging branch, because this is tested by the OpenZFS
   # maintainers.
-  version = "2.4.0-rc5";
+  version = "2.4.0";
   # rev = "";
 
   tests = {
     inherit (nixosTests.zfs) unstable;
   };
 
-  hash = "sha256-HLxqzZjAFnaKqzy1CA3RecTdqpheR2pmFCTqMIcm+wk=";
+  hash = "sha256-v78Tn1Im9h8Sjd4XACYesPOD+hlUR3Cmg8XjcJXOuwM=";
 
   extraLongDescription = ''
     This is "unstable" ZFS, and will usually be a pre-release version of ZFS.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b222327f191..4282a63ddec7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10123,11 +10123,15 @@ with pkgs;
       zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix {
         configFile = "user";
       };
+      zfs_2_4 = callPackage ../os-specific/linux/zfs/2_4.nix {
+        configFile = "user";
+      };
       zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {
         configFile = "user";
       };
     })
     zfs_2_3
+    zfs_2_4
     zfs_unstable
     ;
   zfs = zfs_2_3;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index d796a2739c91..821abfb26474 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -670,6 +670,10 @@ in
           configFile = "kernel";
           inherit pkgs kernel;
         };
+        zfs_2_4 = callPackage ../os-specific/linux/zfs/2_4.nix {
+          configFile = "kernel";
+          inherit pkgs kernel;
+        };
         zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {
           configFile = "kernel";
           inherit pkgs kernel;