diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 6931c5a22..c0738fda0 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -71,10 +71,12 @@ class Gencontrol(Base):
                       (arch, makeflags)])
 
         # Add udebs using kernel-wedge
-        installer_dir = 'debian/installer/' + arch
-        if os.path.isdir(installer_dir):
+        installer_def_dir = 'debian/installer'
+        installer_arch_dir = os.path.join(installer_def_dir, arch)
+        if os.path.isdir(installer_arch_dir):
             kw_env = os.environ.copy()
-            kw_env['KW_CONFIG_DIR'] = installer_dir
+            kw_env['KW_DEFCONFIG_DIR'] = installer_def_dir
+            kw_env['KW_CONFIG_DIR'] = installer_arch_dir
             kw_proc = subprocess.Popen(
                 ['kernel-wedge', 'gen-control',
                  self.abiname],
diff --git a/debian/changelog b/debian/changelog
index 9f65c7871..0e8cd78c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ linux-2.6 (3.2~rc4-1~experimental.1) UNRELEASED; urgency=low
   * dm: Enable DM_THIN_PROVISIONING as module
   * b43: Enable B43_PHY_HT
   * [ia64,powerpc,sparc,x86] wireless: Enable MWIFIEX_PCIE as module
+  * udeb: Update configuration for 3.2:
+    - Provide the default configuration instead of including it from the
+      kernel-wedge package
 
   [ Uwe Kleine-König ]
   * [amd64] reenable rt featureset with 3.2-rc4-rt5
diff --git a/debian/installer/modules/acpi-modules b/debian/installer/modules/acpi-modules
new file mode 100644
index 000000000..d4723a10b
--- /dev/null
+++ b/debian/installer/modules/acpi-modules
@@ -0,0 +1,2 @@
+fan
+thermal
diff --git a/debian/installer/modules/affs-modules b/debian/installer/modules/affs-modules
new file mode 100644
index 000000000..ac2825911
--- /dev/null
+++ b/debian/installer/modules/affs-modules
@@ -0,0 +1 @@
+affs
diff --git a/debian/installer/modules/ata-modules b/debian/installer/modules/ata-modules
new file mode 100644
index 000000000..6ca33ce0a
--- /dev/null
+++ b/debian/installer/modules/ata-modules
@@ -0,0 +1,2 @@
+libata
+ata_generic
diff --git a/debian/installer/modules/brltty-modules b/debian/installer/modules/brltty-modules
new file mode 100644
index 000000000..434556685
--- /dev/null
+++ b/debian/installer/modules/brltty-modules
@@ -0,0 +1 @@
+brlvger
diff --git a/debian/installer/modules/btrfs-modules b/debian/installer/modules/btrfs-modules
new file mode 100644
index 000000000..00531f654
--- /dev/null
+++ b/debian/installer/modules/btrfs-modules
@@ -0,0 +1 @@
+btrfs
diff --git a/debian/installer/modules/cdrom-core-modules b/debian/installer/modules/cdrom-core-modules
new file mode 100644
index 000000000..07d11785e
--- /dev/null
+++ b/debian/installer/modules/cdrom-core-modules
@@ -0,0 +1,3 @@
+cdrom ?
+sr_mod ?
+ide-cd_mod ?
diff --git a/debian/installer/modules/core-modules b/debian/installer/modules/core-modules
new file mode 100644
index 000000000..d06c2be69
--- /dev/null
+++ b/debian/installer/modules/core-modules
@@ -0,0 +1,2 @@
+bitrev ?
+led-class ?
diff --git a/debian/installer/modules/crc-modules b/debian/installer/modules/crc-modules
new file mode 100644
index 000000000..0b8ec0ada
--- /dev/null
+++ b/debian/installer/modules/crc-modules
@@ -0,0 +1,3 @@
+crc-ccitt
+libcrc32c
+crc32c
diff --git a/debian/installer/modules/crypto-dm-modules b/debian/installer/modules/crypto-dm-modules
new file mode 100644
index 000000000..189131fc1
--- /dev/null
+++ b/debian/installer/modules/crypto-dm-modules
@@ -0,0 +1 @@
+dm-crypt
diff --git a/debian/installer/modules/crypto-modules b/debian/installer/modules/crypto-modules
new file mode 100644
index 000000000..1da1df1d4
--- /dev/null
+++ b/debian/installer/modules/crypto-modules
@@ -0,0 +1,7 @@
+aes_generic
+blowfish
+twofish_generic
+serpent
+sha256_generic
+cbc ?
+xts
diff --git a/debian/installer/modules/efi-modules b/debian/installer/modules/efi-modules
new file mode 100644
index 000000000..91732720b
--- /dev/null
+++ b/debian/installer/modules/efi-modules
@@ -0,0 +1 @@
+efivars
diff --git a/debian/installer/modules/event-modules b/debian/installer/modules/event-modules
new file mode 100644
index 000000000..97a5e58aa
--- /dev/null
+++ b/debian/installer/modules/event-modules
@@ -0,0 +1 @@
+evdev
diff --git a/debian/installer/modules/ext2-modules b/debian/installer/modules/ext2-modules
new file mode 100644
index 000000000..43d7af310
--- /dev/null
+++ b/debian/installer/modules/ext2-modules
@@ -0,0 +1 @@
+ext2
diff --git a/debian/installer/modules/ext3-modules b/debian/installer/modules/ext3-modules
new file mode 100644
index 000000000..1c285721e
--- /dev/null
+++ b/debian/installer/modules/ext3-modules
@@ -0,0 +1,2 @@
+ext3
+jbd
diff --git a/debian/installer/modules/ext4-modules b/debian/installer/modules/ext4-modules
new file mode 100644
index 000000000..610034258
--- /dev/null
+++ b/debian/installer/modules/ext4-modules
@@ -0,0 +1,2 @@
+ext4
+jbd2
diff --git a/debian/installer/modules/fat-modules b/debian/installer/modules/fat-modules
new file mode 100644
index 000000000..37e6d059a
--- /dev/null
+++ b/debian/installer/modules/fat-modules
@@ -0,0 +1,6 @@
+fat ?
+vfat
+# the default codepage for fat (as of 2.6.8)
+nls_cp437 ?
+# the default i/o character set for fat (as of 2.6.25)
+nls_utf8 ?
diff --git a/debian/installer/modules/firewire-core-modules b/debian/installer/modules/firewire-core-modules
new file mode 100644
index 000000000..ebfcb22e5
--- /dev/null
+++ b/debian/installer/modules/firewire-core-modules
@@ -0,0 +1,5 @@
+ieee1394 ?
+ohci1394 ?
+sbp2 ?
+firewire-ohci ?
+firewire-sbp2 ?
diff --git a/debian/installer/modules/floppy-modules b/debian/installer/modules/floppy-modules
new file mode 100644
index 000000000..8b54ec8df
--- /dev/null
+++ b/debian/installer/modules/floppy-modules
@@ -0,0 +1 @@
+floppy
diff --git a/debian/installer/modules/hfs-modules b/debian/installer/modules/hfs-modules
new file mode 100644
index 000000000..4a311558e
--- /dev/null
+++ b/debian/installer/modules/hfs-modules
@@ -0,0 +1,2 @@
+hfs
+hfsplus
diff --git a/debian/installer/modules/i2c-modules b/debian/installer/modules/i2c-modules
new file mode 100644
index 000000000..8c51c2436
--- /dev/null
+++ b/debian/installer/modules/i2c-modules
@@ -0,0 +1 @@
+i2c-core
diff --git a/debian/installer/modules/ide-core-modules b/debian/installer/modules/ide-core-modules
new file mode 100644
index 000000000..96284d155
--- /dev/null
+++ b/debian/installer/modules/ide-core-modules
@@ -0,0 +1 @@
+ide-core
diff --git a/debian/installer/modules/ide-modules b/debian/installer/modules/ide-modules
new file mode 100644
index 000000000..c8ad937e5
--- /dev/null
+++ b/debian/installer/modules/ide-modules
@@ -0,0 +1,32 @@
+ide-generic ?
+ide-gd_mod ?
+aec62xx ?
+alim15x3 ?
+amd74xx ?
+atiixp ?
+cmd640 ?
+cmd64x ?
+cs5520 ?
+cs5530 ?
+cs5535 ?
+cy82c693 ?
+it821x ?
+it8213 ?
+jmicron ?
+hpt366 ?
+ns87415 ?
+opti621 ?
+pdc202xx_new ?
+pdc202xx_old ?
+piix ?
+rz1000 ?
+sc1200 ?
+serverworks ?
+siimage ?
+sis5513 ?
+slc90e66 ?
+triflex ?
+trm290 ?
+via82cxxx ?
+delkin_cb ?
+tc86c001 ?
diff --git a/debian/installer/modules/input-modules b/debian/installer/modules/input-modules
new file mode 100644
index 000000000..62fc503cf
--- /dev/null
+++ b/debian/installer/modules/input-modules
@@ -0,0 +1,9 @@
+usbhid
+hid-apple ?
+hid-belkin ?
+hid-microsoft ?
+hid-logitech ?
+hid-monterey ?
+hid-sunplus ?
+hid-cherry ?
+wistron_btns ?
diff --git a/debian/installer/modules/ipv6-modules b/debian/installer/modules/ipv6-modules
new file mode 100644
index 000000000..13ac34b44
--- /dev/null
+++ b/debian/installer/modules/ipv6-modules
@@ -0,0 +1 @@
+ipv6
diff --git a/debian/installer/modules/isofs-modules b/debian/installer/modules/isofs-modules
new file mode 100644
index 000000000..0f41779b7
--- /dev/null
+++ b/debian/installer/modules/isofs-modules
@@ -0,0 +1 @@
+isofs
diff --git a/debian/installer/modules/jffs2-modules b/debian/installer/modules/jffs2-modules
new file mode 100644
index 000000000..19f4e1094
--- /dev/null
+++ b/debian/installer/modules/jffs2-modules
@@ -0,0 +1 @@
+jffs2
diff --git a/debian/installer/modules/jfs-modules b/debian/installer/modules/jfs-modules
new file mode 100644
index 000000000..aa604c468
--- /dev/null
+++ b/debian/installer/modules/jfs-modules
@@ -0,0 +1 @@
+jfs
diff --git a/debian/installer/modules/loop-modules b/debian/installer/modules/loop-modules
new file mode 100644
index 000000000..52817283d
--- /dev/null
+++ b/debian/installer/modules/loop-modules
@@ -0,0 +1,2 @@
+loop
+cloop ?
diff --git a/debian/installer/modules/lzo-modules b/debian/installer/modules/lzo-modules
new file mode 100644
index 000000000..d1a158350
--- /dev/null
+++ b/debian/installer/modules/lzo-modules
@@ -0,0 +1 @@
+lzo_compress
diff --git a/debian/installer/modules/md-modules b/debian/installer/modules/md-modules
new file mode 100644
index 000000000..83f392567
--- /dev/null
+++ b/debian/installer/modules/md-modules
@@ -0,0 +1,11 @@
+linear
+md-mod
+dm-mod
+multipath
+raid0
+raid1
+raid456
+raid10
+xor
+dm-mirror
+dm-snapshot
diff --git a/debian/installer/modules/minix-modules b/debian/installer/modules/minix-modules
new file mode 100644
index 000000000..aa6ca5db6
--- /dev/null
+++ b/debian/installer/modules/minix-modules
@@ -0,0 +1 @@
+minix
diff --git a/debian/installer/modules/mmc-core-modules b/debian/installer/modules/mmc-core-modules
new file mode 100644
index 000000000..67128eac0
--- /dev/null
+++ b/debian/installer/modules/mmc-core-modules
@@ -0,0 +1 @@
+mmc_core
diff --git a/debian/installer/modules/mmc-modules b/debian/installer/modules/mmc-modules
new file mode 100644
index 000000000..1b8b76446
--- /dev/null
+++ b/debian/installer/modules/mmc-modules
@@ -0,0 +1,5 @@
+mmc_block
+sdhci
+sdhci_pci ?
+ricoh_mmc ?
+tifm_sd
diff --git a/debian/installer/modules/mouse-modules b/debian/installer/modules/mouse-modules
new file mode 100644
index 000000000..8d65ba4d8
--- /dev/null
+++ b/debian/installer/modules/mouse-modules
@@ -0,0 +1 @@
+psmouse
diff --git a/debian/installer/modules/multipath-modules b/debian/installer/modules/multipath-modules
new file mode 100644
index 000000000..5fa964ccf
--- /dev/null
+++ b/debian/installer/modules/multipath-modules
@@ -0,0 +1,2 @@
+dm-multipath
+dm-round-robin
diff --git a/debian/installer/modules/nbd-modules b/debian/installer/modules/nbd-modules
new file mode 100644
index 000000000..cb3ca605f
--- /dev/null
+++ b/debian/installer/modules/nbd-modules
@@ -0,0 +1 @@
+nbd
diff --git a/debian/installer/modules/nfs-modules b/debian/installer/modules/nfs-modules
new file mode 100644
index 000000000..a5bfd2ce6
--- /dev/null
+++ b/debian/installer/modules/nfs-modules
@@ -0,0 +1,3 @@
+nfs
+lockd
+sunrpc
diff --git a/debian/installer/modules/nic-extra-modules b/debian/installer/modules/nic-extra-modules
new file mode 100644
index 000000000..82f355b3d
--- /dev/null
+++ b/debian/installer/modules/nic-extra-modules
@@ -0,0 +1,127 @@
+# Note that this is an incomplete list that tries to be a common subset
+# that is right for most kernels. Suppliment with any others.
+82596 ?
+abyss ?
+ac3200 ?
+amd8111e ?
+at1700 ?
+cs89x0 ?
+depca ?
+dl2k
+dmfe
+e2100 ?
+eepro ?
+enc28j60
+forcedeth ?
+hamachi
+hp-plus ?
+hp100 ?
+ibmtr ?
+igb
+ipg ?
+lance ?
+lanstreamer ?
+lne390 ?
+lp486e ?
+ne ?
+ne2 ?
+ni5010 ?
+ni52 ?
+ni65 ?
+niu ?
+r8169
+rrunner ?
+skfp
+sky2
+skge
+smc-ultra ?
+tlan ?
+tmspci ?
+typhoon
+yellowfin
+3c501 ?
+3c503 ?
+3c505 ?
+3c507 ?
+3c509 ?
+3c515 ?
+3c523 ?
+3c527 ?
+3c359 ?
+8139cp
+eexpress ?
+epic100
+es3210 ?
+eth16i ?
+ewrk3 ?
+fealnx
+ns83820
+smc-ultra32 ?
+smc9194 ?
+starfire
+sundance
+olympic
+arlan ?
+de2104x ?
+de600 ?
+de620 ?
+defxx ?
+e1000 ?
+e1000e ?
+hp ?
+ixgb ?
+ixgbe ?
+ne3210 ?
+pcnet32 ?
+s2io ?
+sis190 ?
+sis900 ?
+via-rhine ?
+via-velocity ?
+wd ?
+znet ?
+bnx2 ?
+bnx2x ?
+cassini ?
+cxgb ?
+sis190 ?
+skge ?
+uli526x ?
+sky2 ?
+acenic ?
+netxen_nic ?
+qla3xxx ?
+cxgb3 ?
+atl1 ?
+atl1c ?
+atl1e ?
+atl2 ?
+r6040
+sfc
+jme ?
+enic ?
+be2net ?
+myri10ge ?
+sc92031 ?
+inet_lro ?
+qlcnic ?
+bna ?
+
+# phy drivers
+broadcom ?
+cicada ?
+davicom ?
+et1011c ?
+icplus ?
+lxt ?
+marvell ?
+mdio-bitbang ?
+national ?
+qsemi ?
+realtek ?
+smsc ?
+ste10Xp ?
+vitesse ?
+
+# VMWare
+vmxnet3 ?
diff --git a/debian/installer/modules/nic-modules b/debian/installer/modules/nic-modules
new file mode 100644
index 000000000..16f0d8c2f
--- /dev/null
+++ b/debian/installer/modules/nic-modules
@@ -0,0 +1,11 @@
+# Some very common nic modules.
+3c59x
+8139too
+e100
+natsemi
+ne2k-pci
+tg3 ?
+tulip
+winbond-840
+eth1394 ?
+xen-netfront ?
diff --git a/debian/installer/modules/nic-pcmcia-modules b/debian/installer/modules/nic-pcmcia-modules
new file mode 100644
index 000000000..414d132a1
--- /dev/null
+++ b/debian/installer/modules/nic-pcmcia-modules
@@ -0,0 +1,20 @@
+# Common pcmcia nic modules.
+3c574_cs
+3c589_cs
+airo_cs ?
+axnet_cs
+b44 ?
+com20020_cs ?
+fmvj18x_cs ?
+ibmtr_cs ?
+netwave_cs ?
+nmclan_cs
+orinoco_cs
+pcnet_cs
+ray_cs
+smc91c92_cs
+wavelan_cs ?
+xirc2ps_cs
+xircom_cb
+atmel_cs ?
+wl3501_cs ?
diff --git a/debian/installer/modules/nic-usb-modules b/debian/installer/modules/nic-usb-modules
new file mode 100644
index 000000000..064b926ff
--- /dev/null
+++ b/debian/installer/modules/nic-usb-modules
@@ -0,0 +1,16 @@
+catc
+kaweth
+pegasus
+rtl8150
+usbnet
+# New in 2.6
+asix ?
+zd1201 ?
+cdc_ether ?
+mcs7830 ?
+dm9601 ?
+zd1211rw ?
+rndis_wlan ?
+rtl8180 ?
+rtl8187 ?
+g_ether ?
diff --git a/debian/installer/modules/nic-wireless-modules b/debian/installer/modules/nic-wireless-modules
new file mode 100644
index 000000000..4e8112437
--- /dev/null
+++ b/debian/installer/modules/nic-wireless-modules
@@ -0,0 +1,33 @@
+ieee80211_crypt_wep ?
+atmel_pci ?
+hermes ?
+ipw2100 ?
+ipw2200 ?
+orinoco
+hostap_pci
+orinoco_plx
+orinoco_nortel ?
+orinoco_tmd ?
+prism54 ?
+p54pci
+p54usb
+wavelan ?
+usb8xxx ?
+ath5k ?
+ath9k ?
+iwlagn ?
+iwl3945 ?
+b43 ?
+brcmsmac ?
+
+# rt2x00 drivers
+rt2500pci ?
+rt2500usb ?
+rt2400pci ?
+rt61pci ?
+rt73usb ?
+
+
+# Crypto modules needed for ieee80211 WEP support
+ecb ?
+arc4 ?
diff --git a/debian/installer/modules/parport-modules b/debian/installer/modules/parport-modules
new file mode 100644
index 000000000..2d9f698e6
--- /dev/null
+++ b/debian/installer/modules/parport-modules
@@ -0,0 +1,2 @@
+parport
+parport_pc
diff --git a/debian/installer/modules/pata-modules b/debian/installer/modules/pata-modules
new file mode 100644
index 000000000..4df22e0de
--- /dev/null
+++ b/debian/installer/modules/pata-modules
@@ -0,0 +1,38 @@
+pata_ali ?
+pata_amd ?
+pata_artop ?
+pata_atiixp ?
+pata_cmd64x ?
+pata_cs5520 ?
+pata_cs5530 ?
+pata_cs5535 ?
+pata_cypress ?
+pata_efar ?
+pata_hpt366 ?
+pata_hpt37x ?
+pata_hpt3x2n ?
+pata_hpt3x3 ?
+pata_isapnp ?
+pata_it821x ?
+pata_jmicron ?
+pata_legacy ?
+pata_marvell ?
+pata_mpiix ?
+pata_netcell ?
+pata_ns87410 ?
+pata_oldpiix ?
+pata_opti ?
+pata_optidma ?
+pata_pdc2027x ?
+pata_pdc202xx_old ?
+pata_qdi ?
+pata_radisys ?
+pata_rz1000 ?
+pata_sc1200 ?
+pata_serverworks ?
+pata_sil680 ?
+pata_sch ?
+pata_sl82c105 ?
+pata_triflex ?
+pata_via ?
+pata_winbond ?
diff --git a/debian/installer/modules/pcmcia-modules b/debian/installer/modules/pcmcia-modules
new file mode 100644
index 000000000..ab5b4b234
--- /dev/null
+++ b/debian/installer/modules/pcmcia-modules
@@ -0,0 +1,8 @@
+pcmcia
+
+i82092
+i82365 ?
+pcmcia_core
+tcic ?
+yenta_socket
+pd6729 ?
diff --git a/debian/installer/modules/pcmcia-storage-modules b/debian/installer/modules/pcmcia-storage-modules
new file mode 100644
index 000000000..3aa3f1c8c
--- /dev/null
+++ b/debian/installer/modules/pcmcia-storage-modules
@@ -0,0 +1,2 @@
+ide-cs ?
+pata_pcmcia ?
diff --git a/debian/installer/modules/plip-modules b/debian/installer/modules/plip-modules
new file mode 100644
index 000000000..bcb0ea854
--- /dev/null
+++ b/debian/installer/modules/plip-modules
@@ -0,0 +1 @@
+plip
diff --git a/debian/installer/modules/ppp-modules b/debian/installer/modules/ppp-modules
new file mode 100644
index 000000000..0dd77f0b5
--- /dev/null
+++ b/debian/installer/modules/ppp-modules
@@ -0,0 +1,5 @@
+ppp_async ?
+ppp_deflate
+ppp_synctty ?
+pppoe
+pppox
diff --git a/debian/installer/modules/qnx4-modules b/debian/installer/modules/qnx4-modules
new file mode 100644
index 000000000..05d4adc62
--- /dev/null
+++ b/debian/installer/modules/qnx4-modules
@@ -0,0 +1 @@
+qnx4
diff --git a/debian/installer/modules/reiserfs-modules b/debian/installer/modules/reiserfs-modules
new file mode 100644
index 000000000..5a01360a2
--- /dev/null
+++ b/debian/installer/modules/reiserfs-modules
@@ -0,0 +1 @@
+reiserfs
diff --git a/debian/installer/modules/rtc-modules b/debian/installer/modules/rtc-modules
new file mode 100644
index 000000000..0a78e7856
--- /dev/null
+++ b/debian/installer/modules/rtc-modules
@@ -0,0 +1,2 @@
+rtc ?
+rtc-cmos
diff --git a/debian/installer/modules/sata-modules b/debian/installer/modules/sata-modules
new file mode 100644
index 000000000..119f13fe8
--- /dev/null
+++ b/debian/installer/modules/sata-modules
@@ -0,0 +1,20 @@
+ata_piix ?
+sata_nv ?
+sata_promise ?
+sata_sil ?
+sata_sis ?
+# sata-sis depends on pata-sis; avoid a dependency
+pata_sis ?
+sata_sil24 ?
+sata_svw ?
+sata_sx4 ?
+sata_via ?
+sata_vsc ?
+sata_qstor ?
+sata_uli ?
+ahci ?
+sx8 ?
+sata_sx4 ?
+sata_mv ?
+pdc_adma ?
+sata_inic162x ?
diff --git a/debian/installer/modules/scsi-common-modules b/debian/installer/modules/scsi-common-modules
new file mode 100644
index 000000000..9baefe5e5
--- /dev/null
+++ b/debian/installer/modules/scsi-common-modules
@@ -0,0 +1,5 @@
+aic79xx
+aic7xxx
+BusLogic ?
+sym53c8xx
+sym53c8xx_2 ?
diff --git a/debian/installer/modules/scsi-core-modules b/debian/installer/modules/scsi-core-modules
new file mode 100644
index 000000000..372fed5ed
--- /dev/null
+++ b/debian/installer/modules/scsi-core-modules
@@ -0,0 +1,3 @@
+scsi_dh
+scsi_mod
+sd_mod
diff --git a/debian/installer/modules/scsi-extra-modules b/debian/installer/modules/scsi-extra-modules
new file mode 100644
index 000000000..5fa68cbd7
--- /dev/null
+++ b/debian/installer/modules/scsi-extra-modules
@@ -0,0 +1,40 @@
+3w-xxxx
+DAC960
+aacraid
+aha152x ?
+aic7xxx_old
+cciss
+cpqarray ?
+i2o_block ?
+dtc ?
+eata ?
+fdomain ?
+gdth ?
+hpsa ?
+ibmmca ?
+ips
+megaraid ?
+megaraid_mbox ?
+megaraid_mm ?
+megaraid_sas ?
+mptbase
+mptscsih
+mptspi ?
+mptsas ?
+mpt2sas ?
+mptfc ?
+mvsas
+3w-9xxx ?
+3w-sas ?
+lpfc ?
+osst
+st
+sym53c416 ?
+arcmsr ?
+hptiop ?
+qla4xxx ?
+qla2xxx ?
+pm8001 ?
+
+# VMWare
+vmw_pvscsi ?
diff --git a/debian/installer/modules/scsi-modules b/debian/installer/modules/scsi-modules
new file mode 100644
index 000000000..48361bcf3
--- /dev/null
+++ b/debian/installer/modules/scsi-modules
@@ -0,0 +1,30 @@
+NCR53c406a ?
+advansys ?
+aha1542 ?
+aha1740 ?
+atp870u ?
+dmx3191d
+fd_mcs ?
+g_NCR5380 ?
+imm
+in2000 ?
+pas16 ?
+ppa
+qla1280 ?
+qlogicfas ?
+sg
+sim710 ?
+t128 ?
+tmscsim
+u14-34f ?
+ultrastor ?
+wd7000 ?
+initio ?
+ipr ?
+qlogicfas408 ?
+dc395x ?
+aic94xx ?
+stex ?
+xen-blkfront ?
+iscsi_tcp ?
+iscsi_ibft ?
diff --git a/debian/installer/modules/serial-modules b/debian/installer/modules/serial-modules
new file mode 100644
index 000000000..d842d4b44
--- /dev/null
+++ b/debian/installer/modules/serial-modules
@@ -0,0 +1,2 @@
+serial_cs
+synclink_cs ?
diff --git a/debian/installer/modules/sound-modules b/debian/installer/modules/sound-modules
new file mode 100644
index 000000000..9c2addc07
--- /dev/null
+++ b/debian/installer/modules/sound-modules
@@ -0,0 +1,158 @@
+snd-aaci ?
+snd-ad1816a ?
+snd-ad1848 ?
+snd-ad1889 ?
+snd-aica ?
+snd-ak4113 ?
+snd-ak4114 ?
+snd-ak4117 ?
+snd-ak4xxx-adda ?
+snd-ali5451 ?
+snd-als100 ?
+snd-als300 ?
+snd-als4000 ?
+snd-aoa-codec-onyx ?
+snd-aoa-codec-tas ?
+snd-aoa-codec-toonie ?
+snd-aoa-fabric-layout ?
+snd-aoa-i2sbus ?
+snd-aoa ?
+snd-asihpi ?
+snd-at73c213 ?
+snd-atiixp ?
+snd-atmel-abdac ?
+snd-atmel-ac97c ?
+snd-au1x00 ?
+snd-au8810 ?
+snd-au8820 ?
+snd-au8830 ?
+snd-aw2 ?
+snd-azt1605 ?
+snd-azt2316 ?
+snd-azt2320 ?
+snd-azt3328 ?
+snd-bt87x ?
+snd-ca0106 ?
+snd-cmi8330 ?
+snd-cmipci ?
+snd-cs4231 ?
+snd-cs4236 ?
+snd-cs4281 ?
+snd-cs46xx ?
+snd-cs5530 ?
+snd-cs5535audio ?
+snd-cs8427 ?
+snd-ctxfi ?
+snd-darla20 ?
+snd-darla24 ?
+snd-dt019x ?
+snd-echo3g ?
+snd-emu10k1 ?
+snd-emu10k1x ?
+snd-ens1370 ?
+snd-ens1371 ?
+snd-es1688 ?
+snd-es18xx ?
+snd-es1938 ?
+snd-es1968 ?
+snd-es968 ?
+snd-firewire-speakers ?
+snd-fm801 ?
+snd-gina20 ?
+snd-gina24 ?
+snd-gusclassic ?
+snd-gusextreme ?
+snd-gusmax ?
+snd-harmony ?
+snd-hda-codec-analog ?
+snd-hda-codec-atihdmi ?
+snd-hda-codec-ca0110 ?
+snd-hda-codec-cirrus ?
+snd-hda-codec-cmedia ?
+snd-hda-codec-conexant ?
+snd-hda-codec-hdmi ?
+snd-hda-codec-idt ?
+snd-hda-codec-intelhdmi ?
+snd-hda-codec-nvhdmi ?
+snd-hda-codec-realtek ?
+snd-hda-codec-si3054 ?
+snd-hda-codec-via ?
+snd-hda-codec ?
+snd-hda-intel ?
+snd-hdsp ?
+snd-hdspm ?
+snd-hifier ?
+snd-ice1712 ?
+snd-ice1724 ?
+snd-ice17xx-ak4xxx ?
+snd-indigo ?
+snd-indigodj ?
+snd-indigodjx ?
+snd-indigoio ?
+snd-indigoiox ?
+snd-intel8x0 ?
+snd-interwave ?
+snd-interwave-stb ?
+snd-interwave ?
+snd-isight ?
+snd-jazz16 ?
+snd-korg1212 ?
+snd-layla20 ?
+snd-layla24 ?
+snd-lola ?
+snd-lx6464es ?
+snd-maestro3 ?
+snd-mia ?
+snd-miro ?
+snd-mixart ?
+snd-ml403-ac97cr ?
+snd-mona ?
+snd-msnd-classic ?
+snd-msnd-pinnacle ?
+snd-nm256 ?
+snd-opl3sa2 ?
+snd-opti92x-ad1848 ?
+snd-opti92x-cs4231 ?
+snd-opti93x ?
+snd-oxygen ?
+snd-pcsp ?
+snd-pcxhr ?
+snd-pdaudiocf ?
+snd-powermac ?
+snd-pt2258 ?
+snd-pxa2xx-ac97 ?
+snd-pxa2xx-pcm ?
+snd-riptide ?
+snd-rme32 ?
+snd-rme96 ?
+snd-rme9652 ?
+snd-sa11xx-uda1341 ?
+snd-sb16 ?
+snd-sb8 ?
+snd-sbawe ?
+snd-sc6000 ?
+snd-sgalaxy ?
+snd-sgi-hal2 ?
+snd-sgi-o2 ?
+snd-sh_dac_audio ?
+snd-sis7019 ?
+snd-sonicvibes ?
+snd-sscape ?
+snd-sun-amd7930 ?
+snd-sun-cs4231 ?
+snd-sun-dbri ?
+snd-trident ?
+snd-uda1341 ?
+snd-ua101 ?
+snd-usb-6fire ?
+snd-usb-audio ?
+snd-usb-caiaq ?
+snd-usb-us122l ?
+snd-usb-usx2y ?
+snd-via82xx ?
+snd-virtuoso ?
+snd-vx222 ?
+snd-vxpocket ?
+snd-wavefront ?
+snd-ymfpci ?
+snd_ps3 ?
diff --git a/debian/installer/modules/speakup-modules b/debian/installer/modules/speakup-modules
new file mode 100644
index 000000000..59e3f9e54
--- /dev/null
+++ b/debian/installer/modules/speakup-modules
@@ -0,0 +1,15 @@
+speakup
+speakup_acntpc
+speakup_acntsa
+speakup_apollo
+speakup_audptr
+speakup_bns
+speakup_decext
+speakup_dectlk
+speakup_dtlk
+speakup_dummy
+speakup_keypc
+speakup_ltlk
+speakup_soft
+speakup_spkout
+speakup_txprt
diff --git a/debian/installer/modules/squashfs-modules b/debian/installer/modules/squashfs-modules
new file mode 100644
index 000000000..7c1157fa3
--- /dev/null
+++ b/debian/installer/modules/squashfs-modules
@@ -0,0 +1 @@
+squashfs
diff --git a/debian/installer/modules/ufs-modules b/debian/installer/modules/ufs-modules
new file mode 100644
index 000000000..19173e9aa
--- /dev/null
+++ b/debian/installer/modules/ufs-modules
@@ -0,0 +1 @@
+ufs
diff --git a/debian/installer/modules/uinput-modules b/debian/installer/modules/uinput-modules
new file mode 100644
index 000000000..42bc0053c
--- /dev/null
+++ b/debian/installer/modules/uinput-modules
@@ -0,0 +1 @@
+uinput
diff --git a/debian/installer/modules/usb-modules b/debian/installer/modules/usb-modules
new file mode 100644
index 000000000..d96074f7a
--- /dev/null
+++ b/debian/installer/modules/usb-modules
@@ -0,0 +1,5 @@
+ehci-hcd ?
+ohci-hcd ?
+uhci-hcd ?
+xhci-hcd ?
+usbcore ?
diff --git a/debian/installer/modules/usb-serial-modules b/debian/installer/modules/usb-serial-modules
new file mode 100644
index 000000000..7726ac5ef
--- /dev/null
+++ b/debian/installer/modules/usb-serial-modules
@@ -0,0 +1,7 @@
+usbserial
+belkin_sa ?
+digi_acceleport ?
+ftdi_sio ?
+mct_u232 ?
+pl2303 ?
+spcp8x5 ?
diff --git a/debian/installer/modules/usb-storage-modules b/debian/installer/modules/usb-storage-modules
new file mode 100644
index 000000000..b87ec0ab5
--- /dev/null
+++ b/debian/installer/modules/usb-storage-modules
@@ -0,0 +1,12 @@
+usb-storage
+ums-jumpshot ?
+ums-onetouch ?
+ums-freecom ?
+ums-karma ?
+ums-alauda ?
+ums-datafab ?
+ums-isd200 ?
+ums-sddr09 ?
+ums-cypress ?
+ums-usbat ?
+ums-sddr55 ?
diff --git a/debian/installer/modules/virtio-modules b/debian/installer/modules/virtio-modules
new file mode 100644
index 000000000..84d09e4d7
--- /dev/null
+++ b/debian/installer/modules/virtio-modules
@@ -0,0 +1,6 @@
+virtio_net
+virtio_blk
+virtio_balloon
+
+# Some architectures do not have PCI bus
+virtio_pci ?
diff --git a/debian/installer/modules/xfs-modules b/debian/installer/modules/xfs-modules
new file mode 100644
index 000000000..7bd8fb2ac
--- /dev/null
+++ b/debian/installer/modules/xfs-modules
@@ -0,0 +1,2 @@
+# Not available currently on all kernel versions, so marked optional.
+xfs ?
diff --git a/debian/installer/modules/zlib-modules b/debian/installer/modules/zlib-modules
new file mode 100644
index 000000000..322c546d1
--- /dev/null
+++ b/debian/installer/modules/zlib-modules
@@ -0,0 +1 @@
+zlib_deflate
diff --git a/debian/installer/package-list b/debian/installer/package-list
new file mode 100644
index 000000000..f997bab40
--- /dev/null
+++ b/debian/installer/package-list
@@ -0,0 +1,480 @@
+# This file is used to build up the control file. The kernel version and
+# "-di" are appended to the package names. Section can be left out. So can
+# architecture, which is derived from the files in the modules directory.
+#
+Package: kernel-image
+Priority: extra
+Description: Linux kernel binary image for the Debian installer
+ This package contains the kernel image for the Debian installer
+ boot images. It does _not_ provide a usable kernel for your full
+ Debian system.
+
+Package: nic-modules
+Depends: kernel-image, nic-shared-modules, core-modules
+Priority: standard
+Description: Common NIC drivers
+ This package contains common NIC drivers for the kernel.
+
+Package: nic-extra-modules
+Depends: kernel-image, nic-shared-modules, core-modules, i2c-modules, crc-modules
+Priority: standard
+Description: Rare NIC drivers
+ This package contains rare NIC drivers for the kernel.
+
+Package: nic-wireless-modules
+Depends: kernel-image, nic-shared-modules, core-modules, usb-modules, mmc-modules, pcmcia-modules
+Priority: standard
+Description: Wireless NIC drivers
+ This package contains wireless NIC drivers for the kernel.
+ Includes crypto modules only needed for wireless (WEP).
+
+Package: nic-shared-modules
+Depends: kernel-image
+Priority: standard
+Description: Shared NIC drivers
+ This package contains NIC drivers needed by combinations of nic-modules,
+ nic-extra-modules, nic-pcmcia-modules, and nic-wireless-modules.
+
+Package: serial-modules
+Depends: kernel-image, pcmcia-modules
+Priority: optional
+Description: Serial drivers
+ This package contains serial drivers for the kernel.
+
+Package: usb-serial-modules
+Depends: kernel-image, usb-modules
+Priority: optional
+Description: USB serial drivers
+ This package contains USB serial drivers for the kernel.
+
+Package: ppp-modules
+Depends: kernel-image, serial-modules, zlib-modules, crc-modules
+Priority: optional
+Description: PPP drivers
+ This package contains PPP drivers for the kernel.
+
+Package: ide-modules
+Depends: kernel-image, ide-core-modules
+Priority: standard
+Description: IDE drivers
+ This package contains IDE drivers for the kernel.
+
+Package: pata-modules
+Depends: kernel-image, ata-modules
+Priority: standard
+Description: PATA drivers
+ This package contains PATA drivers for the kernel.
+
+Package: ide-core-modules
+Depends: kernel-image
+Priority: standard
+Description: IDE support
+ This package contains core IDE support for the kernel.
+
+Package: cdrom-core-modules
+Depends: kernel-image, scsi-core-modules, ide-modules, isofs-modules
+Priority: standard
+Description: CDROM support
+ This package contains core CDROM support for the kernel.
+
+Package: cdrom-modules
+Depends: kernel-image, ide-modules, cdrom-core-modules
+Priority: optional
+Description: Esoteric CDROM drivers
+ This package contains esoteric CDROM drivers for the kernel.
+
+Package: firewire-core-modules
+Depends: kernel-image, scsi-core-modules
+Priority: standard
+Description: Core FireWire drivers
+ This package contains core FireWire drivers for the kernel.
+
+Package: scsi-core-modules
+Depends: kernel-image
+Priority: standard
+Description: Core SCSI subsystem
+ This package contains the core SCSI subsystem for the kernel.
+
+Package: scsi-modules
+Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules
+Priority: standard
+Description: SCSI drivers
+ This package contains SCSI drivers for the kernel.
+
+Package: scsi-common-modules
+Depends: kernel-image, scsi-core-modules, cdrom-core-modules
+Priority: standard
+Description: Very common SCSI drivers
+ This package contains very common SCSI drivers for the kernel.
+
+Package: scsi-extra-modules
+Depends: scsi-modules, scsi-core-modules
+Priority: standard
+Description: Uncommon SCSI drivers
+ This package contains uncommon SCSI drivers for the kernel.
+ This includes SCSI RAID drivers, and some of the less common SCSI
+ controllers.
+
+Package: plip-modules
+Depends: kernel-image, parport-modules
+Priority: optional
+Description: PLIP drivers
+ This package contains PLIP drivers for the kernel.
+
+Package: floppy-modules
+Depends: kernel-image
+Priority: standard
+Description: Floppy driver
+ This package contains the floppy driver for the kernel.
+
+Package: loop-modules
+Depends: kernel-image
+Priority: standard
+Description: Loopback filesystem support
+ This package contains loopback filesystem support for the kernel.
+
+Package: ipv6-modules
+Depends: kernel-image
+Priority: extra
+Description: IPv6 driver
+ This package contains the IPv6 driver for the kernel.
+
+Package: nls-core-modules
+Depends: kernel-image
+Priority: extra
+Description: Core NLS support
+ This package contains basic NLS support modules for the kernel.
+
+Package: btrfs-modules
+Depends: kernel-image, core-modules, crc-modules, zlib-modules, lzo-modules
+Priority: extra
+Description: BTRFS filesystem support
+ This package contains the BTRFS filesystem module for the kernel.
+
+Package: ext2-modules
+Depends: kernel-image
+Priority: standard
+Description: EXT2 filesystem support
+ This package contains the EXT2 filesystem module for the kernel.
+
+Package: ext3-modules
+Depends: kernel-image
+Priority: standard
+Description: EXT3 filesystem support
+ This package contains the EXT3 filesystem module for the kernel.
+
+Package: ext4-modules
+Depends: kernel-image, core-modules
+Priority: standard
+Description: EXT4 filesystem support
+ This package contains the EXT4 filesystem module for the kernel.
+
+Package: isofs-modules
+Depends: kernel-image, nls-core-modules
+Priority: standard
+Description: ISOFS filesystem support
+ This package contains the ISOFS filesystem module for the kernel.
+
+Package: jffs2-modules
+Depends: kernel-image, zlib-modules, lzo-modules
+Priority: extra
+Description: JFFS2 filesystem support
+ This package contains the JFFS2 filesystem module for the kernel.
+
+Package: jfs-modules
+Depends: kernel-image, nls-core-modules
+Priority: standard
+Description: JFS filesystem support
+ This package contains the JFS filesystem module for the kernel.
+
+Package: ntfs-modules
+Depends: kernel-image, nls-core-modules
+Priority: extra
+Description: NTFS filesystem support
+ This package contains the NTFS file system module for the kernel.
+
+Package: reiserfs-modules
+Depends: kernel-image
+Priority: extra
+Description: Reiser filesystem support
+ This package contains the Reiser filesystem module for the kernel.
+
+Package: xfs-modules
+Depends: kernel-image
+Priority: standard
+Description: XFS filesystem support
+ This package contains the XFS filesystem module for the kernel.
+
+Package: fat-modules
+Depends: kernel-image, nls-core-modules
+Priority: extra
+Description: FAT filesystem support
+ This package contains the FAT and VFAT filesystem modules for the kernel.
+
+Package: hfs-modules
+Depends: kernel-image, nls-core-modules
+Priority: extra
+Description: HFS filesystem support
+ This package contains the HFS and HFS+ filesystem modules for the kernel.
+
+Package: affs-modules
+Depends: kernel-image
+Priority: extra
+Description: Amiga filesystem support
+ This package contains the Amiga filesystem module for the kernel.
+
+Package: ufs-modules
+Depends: kernel-image
+Priority: extra
+Description: UFS filesystem support
+ This package contains the UFS filesystem module for the kernel.
+
+Package: zfs-modules
+Depends: kernel-image
+Priority: extra
+Description: ZFS filesystem support
+ This package contains the ZFS filesystem module for the kernel.
+
+Package: qnx4-modules
+Depends: kernel-image
+Priority: extra
+Description: QNX4 filesystem support
+ This package contains the QNX4 filesystem module for the kernel.
+
+Package: minix-modules
+Depends: kernel-image
+Priority: extra
+Description: Minix filesystem support
+ This package contains the Minix filesystem module for the kernel.
+
+Package: nfs-modules
+Depends: kernel-image
+Priority: extra
+Description: NFS filesystem support
+ This package contains the NFS filesystem module for the kernel.
+
+Package: nullfs-modules
+Depends: kernel-image
+Priority: standard
+Description: nullfs filesystem support
+ This package contains the nullfs filesystem module for the kernel.
+
+Package: md-modules
+Depends: kernel-image
+Priority: extra
+Description: RAID and LVM support
+ This package contains RAID and LVM modules for the kernel.
+
+Package: multipath-modules
+Depends: kernel-image, md-modules, scsi-core-modules
+Priority: extra
+Description: Multipath support
+ This package contains DM-Multipath modules for the kernel.
+
+Package: usb-modules
+Depends: kernel-image, nls-core-modules
+Priority: extra
+Description: USB support
+ This package contains core USB drivers for the kernel.
+
+Package: usb-storage-modules
+Depends: kernel-image, ide-core-modules, scsi-core-modules, usb-modules
+Priority: standard
+Description: USB storage support
+ This package contains the USB storage driver for the kernel.
+
+Package: pcmcia-storage-modules
+Depends: kernel-image, ide-core-modules, cdrom-core-modules, pcmcia-modules, ata-modules
+Priority: standard
+Description: PCMCIA storage drivers
+ This package contains PCMCIA storage drivers for the kernel.
+
+Package: brltty-modules
+Depends: kernel-image, usb-modules
+Priority: extra
+Description: Braille support
+ This package contains Braille drivers for the kernel.
+
+Package: fb-modules
+Depends: kernel-image
+Priority: extra
+Description: Frame buffer support
+ This package contains Frame buffer drivers for the kernel.
+
+Package: input-modules
+Depends: kernel-image, usb-modules
+Priority: extra
+Description: Input devices support
+ This package contains input device drivers for the kernel.
+
+Package: event-modules
+Depends: kernel-image
+Priority: extra
+Description: Event support
+ This package contains event drivers for the kernel.
+
+Package: mouse-modules
+Depends: kernel-image, event-modules, input-modules, usb-modules
+Priority: extra
+Description: Mouse support
+ This package contains mouse drivers for the kernel.
+
+Package: irda-modules
+Depends: kernel-image, ppp-modules, usb-modules
+Priority: extra
+Description: Infrared devices support
+ This package contains infrared device drivers for the kernel.
+
+Package: parport-modules
+Depends: kernel-image
+Priority: extra
+Description: Parallel port support
+ This package contains parallel port drivers for the kernel.
+
+Package: nic-pcmcia-modules
+Depends: kernel-image, nic-shared-modules, nic-wireless-modules, pcmcia-modules, mmc-core-modules
+Priority: standard
+Description: Common PCMCIA NIC drivers
+ This package contains common PCMCIA NIC drivers for the kernel.
+
+Package: pcmcia-modules
+Depends: kernel-image
+Priority: standard
+Description: Common PCMCIA drivers
+ This package contains common PCMCIA drivers for the kernel.
+
+Package: nic-usb-modules
+Depends: kernel-image, nic-shared-modules, nic-wireless-modules, usb-modules, core-modules
+Priority: standard
+Description: USB NIC drivers
+ This package contains USB network adapter drivers for the kernel.
+
+Package: sata-modules
+Depends: kernel-image, scsi-core-modules, ata-modules
+Priority: standard
+Description: SATA drivers
+ This package contains SATA drivers for the kernel.
+
+Package: core-modules
+Depends: kernel-image
+Priority: standard
+Description: Core modules
+ This package contains core modules for the kernel, that will almost 
+ always be needed.
+
+Package: acpi-modules
+Depends: kernel-image
+Priority: extra
+Description: ACPI support modules
+ This package contains kernel modules for ACPI.
+
+Package: i2c-modules
+Depends: kernel-image
+Priority: extra
+Description: i2c support modules
+ This package contains basic i2c support modules.
+
+Package: crc-modules
+Depends: kernel-image
+Priority: extra
+Description: CRC modules
+ This package contains CRC support modules.
+
+Package: crypto-modules
+Depends: kernel-image
+Priority: extra
+Description: crypto modules
+ This package contains crypto modules.
+
+Package: crypto-dm-modules
+Depends: kernel-image, md-modules
+Priority: extra
+Description: devicemapper crypto module
+ This package contains the devicemapper crypto (dm-crypt) module.
+
+Package: efi-modules
+Depends: kernel-image
+Priority: extra
+Description: EFI modules
+ This package contains EFI modules.
+
+Package: ata-modules
+Depends: kernel-image, scsi-core-modules
+Priority: extra
+Description: ATA disk modules
+ This package contains core ATA disk modules used by both PATA and SATA
+ disk drivers.
+
+Package: mmc-core-modules
+Depends: kernel-image, core-modules
+Priority: extra
+Description: MMC/SD/SDIO core modules
+ This package contains core modules for MMC/SD/SDIO support.
+
+Package: mmc-modules
+Depends: kernel-image, core-modules, mmc-core-modules
+Priority: extra
+Description: MMC/SD card modules
+ This package contains modules needed to support MMC (multimedia) and
+ SD cards.
+
+Package: nbd-modules
+Depends: kernel-image
+Priority: extra
+Description: Network Block Device modules
+ This package contains the modules required for support of the Network Block
+ Device
+
+Package: loop-aes-modules
+Depends: kernel-image!
+Priority: extra
+Description: loop-AES crypto modules
+ This package contains loop-AES crypto modules.
+
+Package: squashfs-modules
+Depends: kernel-image
+Priority: extra
+Description: squashfs modules
+ This package contains squashfs modules.
+
+Package: speakup-modules
+Depends: kernel-image!
+Priority: extra
+Description: speakup modules
+ This package contains speakup modules.
+
+Package: rtc-modules
+Depends: kernel-image
+Priority: extra
+Description: RTC modules
+ This package contains RTC modules.
+
+Package: virtio-modules
+Depends: kernel-image
+Priority: extra
+Description: virtio modules
+ This package contains virtio modules.
+
+Package: uinput-modules
+Depends: kernel-image
+Priority: extra
+Description: uinput support
+ This package contains the uinput module.
+
+Package: sound-modules
+Depends: kernel-image, core-modules, i2c-modules, usb-modules, pcmcia-modules, firewire-core-modules, crc-modules
+Priority: extra
+Description: sound support
+ This package contains sound modules.
+
+Package: zlib-modules
+Depends: kernel-image
+Priority: extra
+Description: zlib modules
+ This package contains zlib modules.
+
+Package: lzo-modules
+Depends: kernel-image
+Priority: extra
+Description: lzo modules
+ This package contains lzo modules.
diff --git a/debian/rules.real b/debian/rules.real
index e75680196..0c9e3df0e 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -479,6 +479,7 @@ ifeq ($(MODULES),True)
 endif
 	+$(MAKE_SELF) install-base BUILDDEB_ARGS="-Zxz"
 
+install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=debian/installer
 install-udeb_$(ARCH): export KW_CONFIG_DIR=debian/installer/$(ARCH)
 install-udeb_$(ARCH): DH_OPTIONS=$(PACKAGE_NAMES:%=-p%)
 install-udeb_$(ARCH):
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index fb1a4a55b..fd51925ee 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>, Frederik Schüler <fs@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@decadent.org.uk>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>> 7), cpio, module-init-tools, python (>= 2.6.6-3~), lzma [armel], kernel-wedge (>= 2.81)
+Build-Depends: debhelper (>> 7), cpio, module-init-tools, python (>= 2.6.6-3~), lzma [armel], kernel-wedge (>= 2.83)
 Build-Depends-Indep: bzip2, xmlto
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/sid/linux-2.6/
 Vcs-Browser: http://svn.debian.org/wsvn/kernel/dists/sid/linux-2.6/?op=log