--- sys/conf/files.orig	Fri Sep 21 01:32:04 2001
+++ sys/conf/files	Mon Sep 24 11:29:46 2001
@@ -839,6 +839,7 @@
 netinet/ip_mroute.c	optional inet
 netinet/ip_output.c	optional inet
 netinet/raw_ip.c	optional inet
+netinet/gre.c		optional gre 
 netinet/tcp_debug.c	optional tcpdebug
 netinet/tcp_input.c	optional inet
 netinet/tcp_output.c	optional inet

--- sys/conf/options.orig	Mon Sep 17 12:09:57 2001
+++ sys/conf/options	Mon Sep 24 11:29:46 2001
@@ -260,6 +260,7 @@
 IPV6FIREWALL_VERBOSE_LIMIT	opt_ip6fw.h
 IPV6FIREWALL_DEFAULT_TO_ACCEPT	opt_ip6fw.h
 IPSTEALTH
+GRE			opt_gre.h
 IPX			opt_ipx.h
 IPXIP			opt_ipx.h
 IPTUNNEL		opt_ipx.h

--- sys/netinet/in_proto.c.orig	Fri Jul 27 01:33:15 2001
+++ sys/netinet/in_proto.c	Mon Sep 24 11:42:31 2001
@@ -38,6 +38,7 @@
 #include "opt_ipx.h"
 #include "opt_ipsec.h"
 #include "opt_inet6.h"
+#include "opt_gre.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -116,6 +117,14 @@
   0,		0,		0,		0,
   &rip_usrreqs
 },
+#ifdef GRE
+{ SOCK_RAW,	&inetdomain,	IPPROTO_GRE,	PR_ATOMIC|PR_ADDR,
+  gre_input,	0,		0,		rip_ctloutput,
+  0,
+  0,		0,		0,		0,
+  &rip_usrreqs
+},
+#endif
 { SOCK_RAW,	&inetdomain,	IPPROTO_ICMP,	PR_ATOMIC|PR_ADDR|PR_LASTHDR,
   icmp_input,	0,		0,		rip_ctloutput,
   0,

--- sys/netinet/ip_var.h.orig	Fri Jul 20 01:32:49 2001
+++ sys/netinet/ip_var.h	Mon Sep 24 11:29:46 2001
@@ -178,6 +178,7 @@
 void	 rip_init __P((void));
 void	 rip_input __P((struct mbuf *, int, int));
 int	 rip_output __P((struct mbuf *, struct socket *, u_long));
+void	gre_input __P((struct mbuf *, int, int));
 void	ipip_input __P((struct mbuf *, int, int));
 void	rsvp_input __P((struct mbuf *, int, int));
 int	ip_rsvp_init __P((struct socket *));