diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 739d63bf479..557c5873d94 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -185,6 +185,12 @@ in
             # Ensure that this job is restarted when fstab changed:
             # ${fstab}
             echo "mounting filesystems..."
+
+            # Create missing mount points.  Note that this won't work
+            # if the mount point is under another mount point.
+            ${flip concatMapStrings config.fileSystems (fs: optionalString fs.autocreate ''
+              mkdir -p -m 0755 '${fs.mountPoint}'
+            '')}
           '';
 
         daemonType = "daemon";