diff --git a/modules/installer/cd-dvd/installation-cd-graphical.nix b/modules/installer/cd-dvd/installation-cd-graphical.nix
index aa49c8e9848..6b40c34968a 100644
--- a/modules/installer/cd-dvd/installation-cd-graphical.nix
+++ b/modules/installer/cd-dvd/installation-cd-graphical.nix
@@ -15,4 +15,7 @@
   # KDE complains if power management is disabled (to be precise, if
   # there is no power management backend such as upower).
   powerManagement.enable = true;
+
+  # Don't start the X server by default.
+  services.xserver.autorun = mkForce false;
 }
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index 534751f5ec7..fda3bf76c2c 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -1,3 +1,6 @@
+# This module defines the software packages included in the "minimal"
+# installation CD.  It might be useful elsewhere.
+
 { config, pkgs, ... }:
 
 {
diff --git a/modules/profiles/graphical.nix b/modules/profiles/graphical.nix
index 1c279a73ac9..a7a241903ad 100644
--- a/modules/profiles/graphical.nix
+++ b/modules/profiles/graphical.nix
@@ -1,16 +1,12 @@
 # This module defines a NixOS configuration that contains X11 and
-# KDE 4.
+# KDE 4.  It's used by the graphical installation CD.
+
 { config, pkgs, ... }:
 
 {
-  require = [ ./base.nix ];
-
   services.xserver = {
     enable = true;
-    autorun = true;
-    defaultDepth = 24;
-    displayManager.auto.enable = true;
-    desktopManager.default = "kde4";
+    displayManager.kdm.enable = true;
     desktopManager.kde4.enable = true;
   };
 }
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 016eeff43e3..287b39ad766 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -137,10 +137,6 @@ in
        ''}
       '';
 
-    # Force the xserver autorun to false.
-    services.xserver.autorun = mkForce false;
-    services.xserver.defaultDepth = mkForce 16;
-
     # Some more help text.
     services.mingetty.helpLine =
       ''