diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 55b367da968d..836f8c45f897 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -125,25 +125,20 @@ in
       "sata_uli" "sata_via" "sata_vsc"
 
       "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
-      "pata_cs5520" "pata_cs5530" /* "pata_cs5535" */ "pata_efar"
+      "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
       "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
       "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
       "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
-      "pata_pcmcia" "pata_pdc2027x" /* "pata_qdi" */ "pata_rz1000"
+      "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
       "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
       "pata_sl82c105" "pata_triflex" "pata_via"
-      # "pata_winbond" <-- causes timeouts in sd_mod
+      "pata_winbond"
 
       # SCSI support (incomplete).
       "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
 
       # USB support, especially for booting from USB CD-ROM
-      # drives.  Also include USB keyboard support for when
-      # something goes wrong in stage 1.
-      "ehci_hcd"
-      "ohci_hcd"
-      "uhci_hcd"
-      "usbhid"
+      # drives.
       "usb_storage"
 
       # Firewire support.  Not tested.
@@ -152,18 +147,15 @@ in
       # Virtio (QEMU, KVM etc.) support.
       "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
 
-      # Wait for SCSI devices to appear.
-      "scsi_wait_scan"
-
       # Add vfat to enable people to copy the contents of the CD to a
       # bootable USB stick.
       "vfat"
-
-      # And of course we need to be able to mount the CD.
-      "iso9660"
     ];
 
-  boot.initrd.kernelModules = [ "loop" ];
+  boot.initrd.kernelModules =
+    [ # Wait for SCSI devices to appear.
+      "scsi_wait_scan"
+    ];
 
   # nixos-install will do a pull from this channel to speed up the
   # installation.
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index e711a5823341..4fa7db9298ba 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -128,8 +128,10 @@ in
       (! config.boot.kernelPackages.kernel.features ? aufs) 
       config.boot.kernelPackages.aufs;
       
-  boot.initrd.availableKernelModules = [ "aufs" "squashfs" ];
+  boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
 
+  boot.initrd.kernelModules = [ "loop" ];
+  
   # Tell stage 1 of the boot to mount a tmpfs on top of the CD using
   # AUFS.  !!! It would be nicer to make the stage 1 init pluggable
   # and move that bit of code here.