diff -urN 7a/Documentation/Configure.help wt5/Documentation/Configure.help
--- 7a/Documentation/Configure.help	Sun Apr 28 01:12:54 2002
+++ wt5/Documentation/Configure.help	Sun Apr 28 01:14:10 2002
@@ -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
@@ -2683,6 +2693,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'.
 
 skb->pkt_type packet match support (EXPERIMENTAL)
 CONFIG_IP_NF_MATCH_PKTTYPE
diff -urN 7a/Makefile wt5/Makefile
--- 7a/Makefile	Sun Apr 28 01:12:54 2002
+++ wt5/Makefile	Sun Apr 28 01:18:50 2002
@@ -89,14 +89,20 @@
 CPPFLAGS := -D__KERNEL__ -I$(HPATH)
 
 ifeq "$(CONFIG_TUX_DEBUG)" ""
+ifdef CONFIG_OPTIM_SIZE
+CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -Os \
+	  -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 \
-	  -fno-strict-aliasing -fno-common
+	  -fno-strict-aliasing -fno-common -fno-strength-reduce
 ifndef CONFIG_FRAME_POINTER
 CFLAGS += -fomit-frame-pointer
 endif
+endif
 else
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
-	  -fno-omit-frame-pointer -fno-strict-aliasing -fno-common -g
+	  -fno-omit-frame-pointer -fno-strict-aliasing -fno-common -g -fno-strength-reduce
 endif
 AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS)
 
diff -urN 7a/arch/i386/Makefile wt5/arch/i386/Makefile
--- 7a/arch/i386/Makefile	Sat Dec  1 18:27:13 2001
+++ wt5/arch/i386/Makefile	Sun Apr 28 01:14:10 2002
@@ -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
diff -urN 7a/arch/i386/config.in wt5/arch/i386/config.in
--- 7a/arch/i386/config.in	Sun Apr 28 01:11:04 2002
+++ wt5/arch/i386/config.in	Sun Apr 28 01:14:10 2002
@@ -174,6 +174,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 7a/net/ipv4/netfilter/Config.in wt5/net/ipv4/netfilter/Config.in
--- 7a/net/ipv4/netfilter/Config.in	Sun Apr 28 01:11:05 2002
+++ wt5/net/ipv4/netfilter/Config.in	Sun Apr 28 01:14:10 2002
@@ -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 '  TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK
   dep_tristate '  talk protocol support' CONFIG_IP_NF_TALK $CONFIG_IP_NF_CONNTRACK
diff -urN 7a/net/ipv4/netfilter/ip_conntrack_core.c wt5/net/ipv4/netfilter/ip_conntrack_core.c
--- 7a/net/ipv4/netfilter/ip_conntrack_core.c	Sun Apr 28 01:11:05 2002
+++ wt5/net/ipv4/netfilter/ip_conntrack_core.c	Sun Apr 28 01:14:10 2002
@@ -1281,7 +1281,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)