diff -urN linux-2.4.16-wt2-5h/Documentation/Configure.help linux-2.4.16-wt2-6a/Documentation/Configure.help
--- linux-2.4.16-wt2-5h/Documentation/Configure.help	Sat Dec  1 22:27:32 2001
+++ linux-2.4.16-wt2-6a/Documentation/Configure.help	Sat Dec  1 22:28:18 2001
@@ -334,6 +334,16 @@
 
   If you are not sure, say N.
 
+Optimize compilation for speed (Default)
+CONFIG_OPTIM_SPEED
+  This option selects optimization for speed, which is the default.
+  If unsure, select Y.
+
+Optimize compilation for size
+CONFIG_OPTIM_SIZE
+  This option selects optimization for reduced code size if using
+  GCC-2.95 or newer. If unsure, select N.
+
 Timer and CPU usage LEDs
 CONFIG_LEDS
   If you say Y here, the LEDs on your machine will be used
@@ -2755,6 +2765,18 @@
 
   If you want to compile it as a module, say M here and read
   <file:Documentation/modules.txt>.  If unsure, say `N'.
+
+IP: connection tracking hash table size
+CONFIG_IP_NF_HASHSIZE
+  This option lets you force a specific size for the connection hash
+  table. This allows for faster processing on dedicated systems, but
+  may consume very large memory. Each unit uses 16 bytes, so a value
+  of 65536 will eat 1 MByte of memory, but will lead to very high
+  performance even on a quite busy firewall. If you let 0 here, the
+  system will configure an appropriate value for a small to medium
+  firewall, depending on the amount of physical memory available.
+
+  If you don't know what this is about, simply say '0'.
 
 IRC Send/Chat support
 CONFIG_IP_NF_IRC
diff -urN linux-2.4.16-wt2-5h/Makefile linux-2.4.16-wt2-6a/Makefile
--- linux-2.4.16-wt2-5h/Makefile	Sat Dec  1 22:27:32 2001
+++ linux-2.4.16-wt2-6a/Makefile	Sat Dec  1 22:29:18 2001
@@ -89,8 +89,16 @@
 CPPFLAGS := -D__KERNEL__ -I$(HPATH)
 
 ifeq "$(CONFIG_TUX_DEBUG)" ""
+
+ifdef CONFIG_OPTIM_SIZE
+CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -Os \
+	-fomit-frame-pointer -fno-strict-aliasing -fno-common -fno-strength-reduce \
+	-malign-loops=0 -malign-jumps=0 -malign-functions=0
+else
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2\
-	  -fomit-frame-pointer -fno-strict-aliasing -fno-common
+	-fomit-frame-pointer -fno-strict-aliasing -fno-common -fno-strength-reduce
+endif
+
 else
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
 	  -fno-omit-frame-pointer -fno-strict-aliasing -fno-common -g
diff -urN linux-2.4.16-wt2-5h/arch/i386/config.in linux-2.4.16-wt2-6a/arch/i386/config.in
--- linux-2.4.16-wt2-5h/arch/i386/config.in	Sat Dec  1 22:27:32 2001
+++ linux-2.4.16-wt2-6a/arch/i386/config.in	Sat Dec  1 22:28:18 2001
@@ -156,6 +156,10 @@
 tristate '/dev/cpu/*/msr - Model-specific register support' CONFIG_X86_MSR
 tristate '/dev/cpu/*/cpuid - CPU information support' CONFIG_X86_CPUID
 
+choice 'Optimize code for' \
+  "Speed          CONFIG_OPTIM_SPEED \
+   Size           CONFIG_OPTIM_SIZE" Speed
+
 choice 'High Memory Support' \
 	"off    CONFIG_NOHIGHMEM \
 	 4GB    CONFIG_HIGHMEM4G \
diff -urN linux-2.4.16-wt2-5h/net/ipv4/netfilter/Config.in linux-2.4.16-wt2-6a/net/ipv4/netfilter/Config.in
--- linux-2.4.16-wt2-5h/net/ipv4/netfilter/Config.in	Sat Dec  1 22:27:32 2001
+++ linux-2.4.16-wt2-6a/net/ipv4/netfilter/Config.in	Sat Dec  1 22:28:18 2001
@@ -6,6 +6,7 @@
 
 tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP_NF_CONNTRACK
 if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then
+  int  'Connection tracking hash table size (0=automatic)' CONFIG_IP_NF_HASHSIZE 0
   dep_tristate '  FTP protocol support' CONFIG_IP_NF_FTP $CONFIG_IP_NF_CONNTRACK
   dep_tristate '  IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK
 fi
diff -urN linux-2.4.16-wt2-5h/net/ipv4/netfilter/ip_conntrack_core.c linux-2.4.16-wt2-6a/net/ipv4/netfilter/ip_conntrack_core.c
--- linux-2.4.16-wt2-5h/net/ipv4/netfilter/ip_conntrack_core.c	Sat Dec  1 22:27:32 2001
+++ linux-2.4.16-wt2-6a/net/ipv4/netfilter/ip_conntrack_core.c	Sat Dec  1 22:28:18 2001
@@ -1069,7 +1069,11 @@
 	nf_unregister_sockopt(&so_getorigdst);
 }
 
+#ifdef CONFIG_IP_NF_HASHSIZE
+static int hashsize = CONFIG_IP_NF_HASHSIZE;
+#else
 static int hashsize = 0;
+#endif
 MODULE_PARM(hashsize, "i");
 
 int __init ip_conntrack_init(void)
--- linux-2.4.16/arch/i386/Makefile	Thu Jul  5 11:26:11 2001
+++ linux-2.4.16-wt2/arch/i386/Makefile	Mon Dec  3 12:34:04 2001
@@ -86,6 +86,10 @@
 CFLAGS += -march=i586
 endif
 
+ifdef CONFIG_OPTIM_SIZE
+CFLAGS += -mcpu=i386
+endif
+
 HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
 
 SUBDIRS += arch/i386/kernel arch/i386/mm arch/i386/lib