diff --git a/make/linux.mk b/make/linux.mk
index d57d59007e..2600afc01f 100644
--- a/make/linux.mk
+++ b/make/linux.mk
@@ -22,9 +22,9 @@
 ifneq ($(filter $(TARGETS),linux),)
 
 # Version of Linux to download and then apply patches to
-DOWNLOAD_LINUX_VERSION=2.4.22
+DOWNLOAD_LINUX_VERSION=2.4.23
 # Version of Linux AFTER patches
-LINUX_VERSION=2.4.23-pre6-erik
+LINUX_VERSION=2.4.23-erik
 
 LINUX_FORMAT=bzImage
 LINUX_BINLOC=arch/$(ARCH)/boot/$(LINUX_FORMAT)
diff --git a/sources/kernel-patches/001-patch-2.4.23-pre6.bz2 b/sources/kernel-patches/001-patch-2.4.23-pre6.bz2
deleted file mode 100644
index 9e5af84953..0000000000
Binary files a/sources/kernel-patches/001-patch-2.4.23-pre6.bz2 and /dev/null differ
diff --git a/sources/kernel-patches/002-cset-20031007_0102.txt.bz2 b/sources/kernel-patches/002-cset-20031007_0102.txt.bz2
deleted file mode 100644
index 80a7357cf1..0000000000
Binary files a/sources/kernel-patches/002-cset-20031007_0102.txt.bz2 and /dev/null differ
diff --git a/sources/kernel-patches/002_readahead.bz2 b/sources/kernel-patches/002_readahead.bz2
new file mode 100644
index 0000000000..4102af7921
Binary files /dev/null and b/sources/kernel-patches/002_readahead.bz2 differ
diff --git a/sources/kernel-patches/005-ieee1394.bz2 b/sources/kernel-patches/005-ieee1394.bz2
index 29e746afbd..ccf5d55df8 100644
Binary files a/sources/kernel-patches/005-ieee1394.bz2 and b/sources/kernel-patches/005-ieee1394.bz2 differ
diff --git a/sources/kernel-patches/008-ieee1394-fix.bz2 b/sources/kernel-patches/008-ieee1394-fix.bz2
new file mode 100644
index 0000000000..d88f251349
Binary files /dev/null and b/sources/kernel-patches/008-ieee1394-fix.bz2 differ
diff --git a/sources/kernel-patches/010-optimize-for-size.bz2 b/sources/kernel-patches/010-optimize-for-size.bz2
index 4ce6cb3336..904f6a9df4 100644
Binary files a/sources/kernel-patches/010-optimize-for-size.bz2 and b/sources/kernel-patches/010-optimize-for-size.bz2 differ
diff --git a/sources/kernel-patches/011_lowlatency-fixes-13.bz2 b/sources/kernel-patches/011_lowlatency-fixes-13.bz2
new file mode 100644
index 0000000000..a4caf01272
Binary files /dev/null and b/sources/kernel-patches/011_lowlatency-fixes-13.bz2 differ
diff --git a/sources/kernel-patches/012-scsi-error-tmout.bz2 b/sources/kernel-patches/012-scsi-error-tmout.bz2
deleted file mode 100644
index 62e1a9f75d..0000000000
Binary files a/sources/kernel-patches/012-scsi-error-tmout.bz2 and /dev/null differ
diff --git a/sources/kernel-patches/031-x86-check_gcc.bz2 b/sources/kernel-patches/012-x86-check_gcc.bz2
similarity index 100%
rename from sources/kernel-patches/031-x86-check_gcc.bz2
rename to sources/kernel-patches/012-x86-check_gcc.bz2
diff --git a/sources/kernel-patches/013-proc-scsi-scsi-race.bz2 b/sources/kernel-patches/013-proc-scsi-scsi-race.bz2
deleted file mode 100644
index a38486d0ce..0000000000
Binary files a/sources/kernel-patches/013-proc-scsi-scsi-race.bz2 and /dev/null differ
diff --git a/sources/kernel-patches/030_lowlatency-fixes-13.bz2 b/sources/kernel-patches/030_lowlatency-fixes-13.bz2
deleted file mode 100644
index d9d0154045..0000000000
Binary files a/sources/kernel-patches/030_lowlatency-fixes-13.bz2 and /dev/null differ
diff --git a/sources/kernel-patches/044_streaming_io.bz2 b/sources/kernel-patches/044_streaming_io.bz2
index 770eb8d65f..5aadca56ed 100644
Binary files a/sources/kernel-patches/044_streaming_io.bz2 and b/sources/kernel-patches/044_streaming_io.bz2 differ
diff --git a/sources/kernel-patches/062-silence-blk-queue.bz2 b/sources/kernel-patches/062-silence-blk-queue.bz2
new file mode 100644
index 0000000000..84a9a05c79
Binary files /dev/null and b/sources/kernel-patches/062-silence-blk-queue.bz2 differ
diff --git a/sources/kernel-patches/063-silence.patch.bz2 b/sources/kernel-patches/063-silence.patch.bz2
new file mode 100644
index 0000000000..04c56d62bc
Binary files /dev/null and b/sources/kernel-patches/063-silence.patch.bz2 differ
diff --git a/sources/kernel-patches/076_nmap-freak.bz2 b/sources/kernel-patches/076_nmap-freak.bz2
index 3a8ae9812d..39483c60ce 100644
Binary files a/sources/kernel-patches/076_nmap-freak.bz2 and b/sources/kernel-patches/076_nmap-freak.bz2 differ
diff --git a/sources/kernel-patches/078_hostap.bz2 b/sources/kernel-patches/078_hostap.bz2
new file mode 100644
index 0000000000..be36ea2d66
Binary files /dev/null and b/sources/kernel-patches/078_hostap.bz2 differ
diff --git a/sources/kernel-patches/085_init-argv.bz2 b/sources/kernel-patches/085_init-argv.bz2
deleted file mode 100644
index ad1ed31a14..0000000000
Binary files a/sources/kernel-patches/085_init-argv.bz2 and /dev/null differ
diff --git a/sources/kernel-patches/100_VERSION.bz2 b/sources/kernel-patches/100_VERSION.bz2
index 4e9687bdb6..df7c10fc81 100644
Binary files a/sources/kernel-patches/100_VERSION.bz2 and b/sources/kernel-patches/100_VERSION.bz2 differ
diff --git a/sources/linux.config b/sources/linux.config
index d7fc654826..46a835b209 100644
--- a/sources/linux.config
+++ b/sources/linux.config
@@ -56,6 +56,7 @@ CONFIG_X86_F00F_WORKS_OK=y
 # CONFIG_MICROCODE is not set
 # CONFIG_X86_MSR is not set
 # CONFIG_X86_CPUID is not set
+# CONFIG_EDD is not set
 CONFIG_NOHIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
@@ -533,14 +534,18 @@ CONFIG_NET_RADIO=y
 # CONFIG_AIRONET4500_PROC is not set
 # CONFIG_AIRO is not set
 CONFIG_HERMES=m
+# CONFIG_HOSTAP is not set
 # CONFIG_PLX_HERMES is not set
 # CONFIG_TMD_HERMES is not set
 # CONFIG_PCI_HERMES is not set
+# CONFIG_HOSTAP_PLX is not set
+# CONFIG_HOSTAP_PCI is not set
 
 #
 # Wireless Pcmcia cards support
 #
 CONFIG_PCMCIA_HERMES=m
+# CONFIG_HOSTAP_CS is not set
 # CONFIG_AIRO_CS is not set
 CONFIG_NET_WIRELESS=y