diff --git a/ChangeLog b/ChangeLog
index 847e5a2..708d92b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-08  Stephen Hemminger  <shemminger@osdl.org>
+
+	* Update to 2.6.13+ kernel headers
+	* Fix array overrun in paretonormal
+	* Fix ematch to not include dropped fields from skb.
+	
 2005-07-14  Thomas Graf <tgraf@suug.ch>
 
 	* Make ematch bison/lex build with common flex
diff --git a/include/SNAPSHOT.h b/include/SNAPSHOT.h
index 06c92ed..ff0c4e1 100644
--- a/include/SNAPSHOT.h
+++ b/include/SNAPSHOT.h
@@ -1 +1 @@
-static char SNAPSHOT[] = "050607";
+static char SNAPSHOT[] = "050808";
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 13828e5..90be210 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -5,7 +5,7 @@
 #include <linux/types.h>
 
 #define NETLINK_ROUTE		0	/* Routing/device hook				*/
-#define NETLINK_SKIP		1	/* Reserved for ENskip  			*/
+#define NETLINK_W1		1	/* 1-wire subsystem				*/
 #define NETLINK_USERSOCK	2	/* Reserved for user mode socket protocols 	*/
 #define NETLINK_FIREWALL	3	/* Firewalling hook				*/
 #define NETLINK_TCPDIAG		4	/* TCP socket monitoring			*/
@@ -14,7 +14,9 @@
 #define NETLINK_SELINUX		7	/* SELinux event notifications */
 #define NETLINK_ARPD		8
 #define NETLINK_AUDIT		9	/* auditing */
+#define NETLINK_FIB_LOOKUP	10	
 #define NETLINK_ROUTE6		11	/* af_inet6 route comm channel */
+#define NETLINK_NETFILTER	12	/* netfilter subsystem */
 #define NETLINK_IP6_FW		13
 #define NETLINK_DNRTMSG		14	/* DECnet routing messages */
 #define NETLINK_KOBJECT_UEVENT	15	/* Kernel messages to userspace */
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index d2aa214..bd2c5a2 100644
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -276,6 +276,7 @@
 	__u8	protocol;
 	__u8	tunnelid;
 	__u8	tunnelhdr;
+	__u8	pad;
 };
 
 /* ROUTE filter */
@@ -408,6 +409,7 @@
 	TCF_EM_NBYTE,
 	TCF_EM_U32,
 	TCF_EM_META,
+	TCF_EM_TEXT,
 	__TCF_EM_MAX
 };
 
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 1d9da36..60ffcb9 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -221,9 +221,11 @@
 /* gred setup */
 struct tc_gred_sopt
 {
-       __u32           DPs;
-       __u32           def_DP;
-       __u8            grio;
+       __u32		DPs;
+       __u32		def_DP;
+       __u8		grio;
+       __u8		pad1;
+       __u16		pad2;
 };
 
 /* HTB section */
@@ -351,6 +353,7 @@
 #define	TC_CBQ_OVL_DROP		3
 #define	TC_CBQ_OVL_RCLASSIC	4
 	unsigned char	priority2;
+	__u16		pad;
 	__u32		penalty;
 };
 
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index afc47fd..25b3549 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -363,6 +363,8 @@
 struct rta_session
 {
 	__u8	proto;
+	__u8	pad1;
+	__u16	pad2;
 
 	union {
 		struct {
@@ -635,10 +637,13 @@
 struct prefixmsg
 {
 	unsigned char	prefix_family;
+	unsigned char	prefix_pad1;
+	unsigned short	prefix_pad2;
 	int		prefix_ifindex;
 	unsigned char	prefix_type;
 	unsigned char	prefix_len;
 	unsigned char	prefix_flags;
+	unsigned char	prefix_pad3;
 };
 
 enum 
diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h
index a6b2cc5..081b1ee 100644
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux/tc_ematch/tc_em_meta.h
@@ -41,19 +41,14 @@
 	TCF_META_ID_LOADAVG_1,
 	TCF_META_ID_LOADAVG_2,
 	TCF_META_ID_DEV,
-	TCF_META_ID_INDEV,
-	TCF_META_ID_REALDEV,
 	TCF_META_ID_PRIORITY,
 	TCF_META_ID_PROTOCOL,
-	TCF_META_ID_SECURITY,
 	TCF_META_ID_PKTTYPE,
 	TCF_META_ID_PKTLEN,
 	TCF_META_ID_DATALEN,
 	TCF_META_ID_MACLEN,
 	TCF_META_ID_NFMARK,
 	TCF_META_ID_TCINDEX,
-	TCF_META_ID_TCVERDICT,
-	TCF_META_ID_TCCLASSID,
 	TCF_META_ID_RTCLASSID,
 	TCF_META_ID_RTIIF,
 	TCF_META_ID_SK_FAMILY,
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 9703d6b..6676379 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -127,6 +127,7 @@
 #define TCP_WINDOW_CLAMP	10	/* Bound advertised window */
 #define TCP_INFO		11	/* Information about this connection. */
 #define TCP_QUICKACK		12	/* Block/reenable quick acks */
+#define TCP_CONGESTION		13	/* Congestion control algorithm */
 
 #define TCPI_OPT_TIMESTAMPS	1
 #define TCPI_OPT_SACK		2
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index d68391a..f0d4233 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -196,6 +196,7 @@
 	__u8				flags;
 #define XFRM_STATE_NOECN	1
 #define XFRM_STATE_DECAP_DSCP	2
+#define XFRM_STATE_NOPMTUDISC	4
 };
 
 struct xfrm_usersa_id {
diff --git a/netem/paretonormal.c b/netem/paretonormal.c
index 528de78..ed75f28 100644
--- a/netem/paretonormal.c
+++ b/netem/paretonormal.c
@@ -51,7 +51,7 @@
 {
 	int i,n;
 	double x;
-	double table[TABLESIZE];
+	double table[TABLESIZE+1];
 
 	for (x = -10.0; x < 10.05; x += .00005) {
 		i = rint(TABLESIZE*normal(x, 0.0, 1.0));
diff --git a/tc/em_meta.c b/tc/em_meta.c
index 86186c1..bd1e151 100644
--- a/tc/em_meta.c
+++ b/tc/em_meta.c
@@ -62,18 +62,11 @@
 	__A(SECTION,		"Interfaces", "", ""),
 	__A(DEV,		"dev",		"iv",
 				"Device the packet is on"),
-	__A(INDEV,		"indev",	"iv",
-				"Device the packet came in"),
-	__A(REALDEV,		"realdev",	"iv",
-				"Underlying real device"),
-
 	__A(SECTION,		"Packet attributes", "", ""),
 	__A(PRIORITY,		"priority",	"i",
 				"Priority of packet"),
 	__A(PROTOCOL,		"protocol",	"i",
 				"Link layer protocol"),
-	__A(SECURITY,		"security",	"i",
-				"Security level"),
 	__A(PKTTYPE,		"pkt_type",	"i",
 				"Packet type (uni|multi|broad|...)cast"),
 	__A(PKTLEN,		"pkt_len",	"i",
@@ -91,9 +84,6 @@
 
 	__A(SECTION,		"Traffic Control", "", ""),
 	__A(TCINDEX,		"tc_index",	"i",	"TC Index"),
-	__A(TCVERDICT,		"tc_verdict",	"i",	"TC Verdict"),
-	__A(TCCLASSID,		"tc_classid",	"i",	"TC ClassID"),
-
 	__A(SECTION,		"Routing", "", ""),
 	__A(RTCLASSID,		"rt_classid",	"i",
 				"Routing ClassID (cls_route)"),