diff --git a/system/options.nix b/system/options.nix
index 8ef10f42f2a..df30b8e011a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1417,7 +1417,12 @@ in
 
       packageFun = mkOption {
         default = pkgs.xorg;
-        merge = backwardPkgsFunMerge;
+        merge = obsolete "option" backwardPkgsFunMerge;
+        description = "Obsolete: use 'package' instead.";
+      };
+
+      package = mkOption {
+        default = config.services.xserver.packageFun; # pkgs.xorg;
         description = "
           Alternative X.org package to use. For 
           example, you can replace individual drivers.
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 9218c80d2b0..a528952c6b1 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -10,7 +10,7 @@ let
 
   # Abbreviations.
   cfg = config.services.xserver;
-  xorg = cfg.packageFun;
+  xorg = cfg.package;
   gnome = pkgs.gnome;
   stdenv = pkgs.stdenv;