diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 1ac89c4c255..93782ffa4d5 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -55,7 +55,8 @@ in
     boot.zfs = {
       useGit = mkOption {
         type = types.bool;
-        default = false;
+        # TODO(wkennington): Revert when 0.6.4 is out
+        default = versionAtLeast config.boot.kernelPackages.kernel.version "3.19";
         example = true;
         description = ''
           Use the git version of the SPL and ZFS packages.