diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index dc3aa9d15cc..5f3e8003b45 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -169,7 +169,7 @@ in
       videoDrivers = mkOption {
         type = types.listOf types.str;
         # !!! We'd like "nv" here, but it segfaults the X server.
-        default = [ "ati" "cirrus" "intel" "vesa" "vmware" ];
+        default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ];
         example = [ "vesa" ];
         description = ''
           The names of the video drivers the configuration
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index fd990ebf17e..ce01b257741 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -422,6 +422,7 @@ let
         xf86videonv = linux;
         xf86videovesa = linux;
         xf86videovmware = linux;
+        xf86videomodesetting = linux;
         xfs = linux;
         xinput = linux;
         xkbcomp = linux;