diff --git a/system/options.nix b/system/options.nix
index 4fcbe1513ff..2828863e987 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -99,7 +99,7 @@ in
         Additional attributes may be needed depending on your
         configuration.  For instance, if you use the NVIDIA X driver,
         then it also needs to contain an attribute
-        <varname>nvidiaDrivers</varname>.
+        <varname>nvidia_x11</varname>.
       ";
     };
 
@@ -152,7 +152,7 @@ in
 
     extraModulePackages = mkOption {
       default = [];
-      # !!! example = [pkgs.aufs pkgs.nvidiaDrivers];
+      # !!! example = [pkgs.aufs pkgs.nvidia_x11];
       description = ''
         A list of additional packages supplying kernel modules.
       '';
diff --git a/system/system.nix b/system/system.nix
index fb09d40ae1e..cb6c8167004 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -46,7 +46,7 @@ rec {
     # Merged into mainline kernel
     # ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi
     # !!! this should be declared by the xserver Upstart job.
-    ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
+    ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidia_x11
     ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
     ++ config.boot.extraModulePackages
   );
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 1a84add6f05..ff6f34e5de7 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -14,7 +14,7 @@ let
   stdenv = pkgs.stdenv;
 
   knownVideoDrivers = {
-    nvidia = { modulesFirst = [ kernelPackages.nvidiaDrivers ]; };  #make sure it first loads the nvidia libs
+    nvidia = { modulesFirst = [ kernelPackages.nvidia_x11 ]; };  #make sure it first loads the nvidia libs
     vesa =  { modules = [xorg.xf86videovesa]; };
     vga =   { modules = [xorg.xf86videovga]; };
     sis =   { modules = [xorg.xf86videosis]; };
@@ -351,7 +351,6 @@ let
       };
     in if cfg.slim.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;       
 
-    nvidiaDrivers = (config.boot.kernelPackages pkgs).nvidiaDrivers;
 
 in
 
@@ -401,7 +400,7 @@ rec {
     xorg.xset # used by startkde, non-essential
   ]
   ++ optional (videoDriver == "nvidia") [
-    kernelPackages.nvidiaDrivers
+    kernelPackages.nvidia_x11
   ];
 
 
@@ -425,7 +424,7 @@ rec {
       rm -f /var/run/opengl-driver
       ${if videoDriver == "nvidia"        
         then ''
-          ln -sf ${kernelPackages.nvidiaDrivers} /var/run/opengl-driver
+          ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
         ''
         else if cfg.driSupport
         then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
@@ -444,7 +443,7 @@ rec {
     env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
 
     ${if videoDriver == "nvidia" 
-      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidiaDrivers}/lib" 
+      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib" 
       else ""
     }