diff --git a/modules/config/no-x-libs.nix b/modules/config/no-x-libs.nix
index 3194eb9b324..fbefc5b6b3e 100644
--- a/modules/config/no-x-libs.nix
+++ b/modules/config/no-x-libs.nix
@@ -5,7 +5,11 @@
     environment.noXlibs = pkgs.lib.mkOption {
       default = false;
       example = true;
-      description = "Removing on-by-default X-dependent settings";
+      description = ''
+        Switch off the options in the default configuration that require X libraries.
+	Currently this includes: sshd.forwardX11, dbus, hal, fonts.enableCoreFonts,
+	fonts.enableFontConfig
+      '';
     };
   };
   config = pkgs.lib.mkIf config.environment.noXlibs {
diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
index 30aa7e1c351..6f85e7a8d51 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
@@ -26,10 +26,6 @@ rec {
   '';
 
   boot.initrd.extraKernelModules = [
-    "i8042" "pcips2" "serio" "mousedev" "evdev" "psmouse" "sermouse"
-    "synaptics_i2c" "unix" "usbhid" "uhci_hcd" "ehci_hcd" "ohci_hcd" 
-    "atkbd" "xtkbd" 
-    # CD part
     "iso9660" "loop" "squashfs"
     ];
   boot.initrd.allowMissing = true;
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 2a052d213d4..ea6f2812485 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -28,9 +28,9 @@ let
           "selinux=0"
           "apm=on"
           "acpi=on"
-          "vga=0x317"
           "console=tty1"
           "splash=verbose"
+          "vga=0x317"
         ];
         description = "
           The kernel parameters.  If you want to add additional
@@ -101,12 +101,17 @@ let
             
             # Support USB keyboards, in case the boot fails and we only have
             # a USB keyboard.
+            "uhci_hcd"
             "ehci_hcd"
             "ohci_hcd"
             "usbhid"
 
             # LVM.
             "dm_mod"
+
+	    # All-mod-config case:
+	    "unix"
+	    "i8042" "pcips2" "serio" "atkbd" "xtkbd"
           ];
           description = "
             The set of kernel modules in the initial ramdisk used during the
@@ -179,7 +184,7 @@ let
 in
 
 {
-  require = [options];
+  require = [ options ];
 
   system.build = { inherit kernel; };
   system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 0480a277afd..04b5b5fa525 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -31,7 +31,7 @@ let
     };
 
     boot.initrd.allowMissing = mkOption {
-      default = false;
+      default = true;
       description = ''
         Allow some initrd components to be missing. Useful for
         custom kernel that are changed too often to track needed