diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 5735d943c51..699e9b3c33c 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -94,9 +94,7 @@ in
           example = "data=journal";
           type = types.string;
           merge = pkgs.lib.concatStringsSep ",";
-          description = "
-            Option used to mount the file system.
-          ";
+          description = "Options used to mount the file system.";
         };
 
         autocreate = mkOption {
@@ -107,6 +105,12 @@ in
             <option>fileSystems.*.mountPoint</option>.
           ";
         };
+
+        noCheck = mkOption {
+          default = false;
+          type = types.bool;
+          description = "Disable running fsck on this filesystem.";
+        };
       };
     };
   
@@ -142,7 +146,8 @@ in
                 + " " + fs.fsType
                 + " " + fs.options
                 + " 0"
-                + " " + (if fs.fsType == "none" then "0" else if fs.mountPoint == "/" then "1" else "2")
+                + " " + (if fs.fsType == "none" || fs.noCheck then "0" else
+                         if fs.mountPoint == "/" then "1" else "2")
                 + "\n"
             )}