diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/crc-modules b/helpers/DATA/linux/d-i/modules/amd64-virtual/crc-modules
new file mode 100644
index 0000000000000000000000000000000000000000..7e00de705e41c15b22cd7d599da0f694c3ef4cbd
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/amd64-virtual/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/nic-wireless-modules b/helpers/DATA/linux/d-i/modules/amd64-virtual/nic-wireless-modules
new file mode 100644
index 0000000000000000000000000000000000000000..53fd18d7f4c7c3ab56c677f5ba565e838862f433
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/amd64-virtual/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/helpers/DATA/linux/d-i/modules/amd64/crc-modules b/helpers/DATA/linux/d-i/modules/amd64/crc-modules
new file mode 100644
index 0000000000000000000000000000000000000000..7e00de705e41c15b22cd7d599da0f694c3ef4cbd
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/amd64/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/helpers/DATA/linux/d-i/modules/amd64/nic-wireless-modules b/helpers/DATA/linux/d-i/modules/amd64/nic-wireless-modules
new file mode 100644
index 0000000000000000000000000000000000000000..53fd18d7f4c7c3ab56c677f5ba565e838862f433
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/amd64/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/helpers/DATA/linux/d-i/modules/arm64/crc-modules b/helpers/DATA/linux/d-i/modules/arm64/crc-modules
new file mode 100644
index 0000000000000000000000000000000000000000..7e00de705e41c15b22cd7d599da0f694c3ef4cbd
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/arm64/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/helpers/DATA/linux/d-i/modules/arm64/nic-wireless-modules b/helpers/DATA/linux/d-i/modules/arm64/nic-wireless-modules
new file mode 100644
index 0000000000000000000000000000000000000000..53fd18d7f4c7c3ab56c677f5ba565e838862f433
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/arm64/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/helpers/DATA/linux/d-i/modules/armhf/crc-modules b/helpers/DATA/linux/d-i/modules/armhf/crc-modules
new file mode 100644
index 0000000000000000000000000000000000000000..7e00de705e41c15b22cd7d599da0f694c3ef4cbd
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/armhf/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/helpers/DATA/linux/d-i/modules/armhf/nic-wireless-modules b/helpers/DATA/linux/d-i/modules/armhf/nic-wireless-modules
new file mode 100644
index 0000000000000000000000000000000000000000..53fd18d7f4c7c3ab56c677f5ba565e838862f433
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/armhf/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/helpers/DATA/linux/d-i/modules/crc-modules b/helpers/DATA/linux/d-i/modules/crc-modules
new file mode 100644
index 0000000000000000000000000000000000000000..349f0afcba7b8cc2b916c173a813c803674b444f
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/crc-modules
@@ -0,0 +1,7 @@
+crc-ccitt
+libcrc32c
+crc32_generic
+crc32c_generic
+crc-itu-t
+crc16
+crc7 ?
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/crc-modules b/helpers/DATA/linux/d-i/modules/i386-virtual/crc-modules
new file mode 100644
index 0000000000000000000000000000000000000000..7e00de705e41c15b22cd7d599da0f694c3ef4cbd
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/i386-virtual/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/nic-wireless-modules b/helpers/DATA/linux/d-i/modules/i386-virtual/nic-wireless-modules
new file mode 100644
index 0000000000000000000000000000000000000000..53fd18d7f4c7c3ab56c677f5ba565e838862f433
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/i386-virtual/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/helpers/DATA/linux/d-i/modules/i386/crc-modules b/helpers/DATA/linux/d-i/modules/i386/crc-modules
new file mode 100644
index 0000000000000000000000000000000000000000..7e00de705e41c15b22cd7d599da0f694c3ef4cbd
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/i386/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/helpers/DATA/linux/d-i/modules/i386/nic-wireless-modules b/helpers/DATA/linux/d-i/modules/i386/nic-wireless-modules
new file mode 100644
index 0000000000000000000000000000000000000000..53fd18d7f4c7c3ab56c677f5ba565e838862f433
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/i386/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/helpers/DATA/linux/d-i/modules/nic-wireless-modules b/helpers/DATA/linux/d-i/modules/nic-wireless-modules
new file mode 100644
index 0000000000000000000000000000000000000000..09a9087415ce5893b6980327b6f8323959595c5a
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/nic-wireless-modules
@@ -0,0 +1,27 @@
+# Include wireless drivers by default
+drivers/net/wireless/**
+
+# Include staging wireless drivers
+prism2_usb ?
+drivers/staging/rtl8** ?
+vt6656_stage ?
+
+# Exclude drivers packaged in nic-pcmcia-modules
+drivers/net/wireless/**_cs -
+airo -
+hostap_plx -
+
+# Don't separate these from their driver families
+libertas_cs ?
+spectrum_cs ?
+
+# Exclude drivers packaged in nic-usb-modules
+rndis_wlan -
+
+# Exclude debug driver
+mac80211_hwsim -
+
+# lib80211 encryption algorithms
+lib80211_crypt_wep ?
+lib80211_crypt_ccmp ?
+lib80211_crypt_tkip ?
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/crc-modules b/helpers/DATA/linux/d-i/modules/ppc64el/crc-modules
new file mode 100644
index 0000000000000000000000000000000000000000..7e00de705e41c15b22cd7d599da0f694c3ef4cbd
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/ppc64el/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/nic-wireless-modules b/helpers/DATA/linux/d-i/modules/ppc64el/nic-wireless-modules
new file mode 100644
index 0000000000000000000000000000000000000000..53fd18d7f4c7c3ab56c677f5ba565e838862f433
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/ppc64el/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/helpers/DATA/linux/d-i/modules/s390x/crc-modules b/helpers/DATA/linux/d-i/modules/s390x/crc-modules
new file mode 100644
index 0000000000000000000000000000000000000000..7e00de705e41c15b22cd7d599da0f694c3ef4cbd
--- /dev/null
+++ b/helpers/DATA/linux/d-i/modules/s390x/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/helpers/DATA/linux/d-i/package-list b/helpers/DATA/linux/d-i/package-list
index 082282a2d6faa6599ab89212dab5c67e9a7cdc72..a4c7699fcc2130f3dd6b491c066617bcd63f6a20 100644
--- a/helpers/DATA/linux/d-i/package-list
+++ b/helpers/DATA/linux/d-i/package-list
@@ -28,7 +28,7 @@ Priority: standard
 Description: Framebuffer modules
 
 Package: firewire-core-modules
-Depends: kernel-image, storage-core-modules
+Depends: kernel-image, storage-core-modules, crc-modules
 Priority: standard
 Description: Firewire (IEEE-1394) Support
 
@@ -52,7 +52,7 @@ Description: Extra filesystem modules
  This includes support for Windows NTFS and MacOS HFS/HFSPlus
 
 Package: input-modules
-Depends: kernel-image, usb-modules
+Depends: kernel-image, usb-modules, crc-modules
 Priority: standard
 Description: Support for various input methods
 
@@ -63,10 +63,17 @@ Provides: crypto-dm-modules
 Description: Multi-device support (raid, device-mapper, lvm)
 
 Package: nic-modules
-Depends: kernel-image, nic-shared-modules, virtio-modules
+Depends: kernel-image, nic-shared-modules, virtio-modules, crc-modules
 Priority: standard
 Description: Network interface support
 
+Package: nic-wireless-modules
+Depends: kernel-image, nic-shared-modules, usb-modules, pcmcia-modules, crc-modules, crypto-modules
+Priority: standard
+Description: Wireless NIC drivers
+ This package contains wireless NIC drivers for the kernel.
+ Includes crypto modules only needed for wireless (WEP, WPA).
+
 Package: nic-pcmcia-modules
 Depends: kernel-image, nic-shared-modules, nic-modules
 Priority: standard
@@ -109,7 +116,7 @@ Priority: standard
 Description: PLIP (parallel port) networking support
 
 Package: ppp-modules
-Depends: kernel-image, nic-shared-modules, serial-modules
+Depends: kernel-image, nic-shared-modules, serial-modules, crc-modules
 Priority: standard
 Description: PPP (serial port) networking support
 
@@ -161,6 +168,12 @@ Depends: kernel-image, storage-core-modules, scsi-modules
 Description: Fusion and i2o storage modules
  This package containes the fusion and i2o storage modules.
 
+Package: crc-modules
+Depends: kernel-image
+Priority: optional
+Description: CRC modules
+ This package contains CRC support modules.
+
 Package: crypto-modules
 Priority: extra
 Depends: kernel-image
diff --git a/helpers/make-linux b/helpers/make-linux
index da8bfb4cdc5cda9c83ccde67ba8621cc0f641890..fbb40cdee2c579806efc70739251b5490dd78466 100644
--- a/helpers/make-linux
+++ b/helpers/make-linux
@@ -19,7 +19,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=12
+VERSION=13
 . ./config
 
 for PATCH in $DATA/*.patch ; do