--- sys/conf/files.orig	Wed Jul 31 08:19:25 2002
+++ sys/conf/files	Fri Sep 27 10:10:27 2002
@@ -877,6 +877,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	Wed Jul 31 08:19:25 2002
+++ sys/conf/options	Fri Sep 27 10:10:27 2002
@@ -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	Wed Dec 19 17:06:37 2001
+++ sys/netinet/in_proto.c	Fri Sep 27 10:10:27 2002
@@ -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	Wed Jul 31 08:22:39 2002
+++ sys/netinet/ip_var.h	Fri Sep 27 10:12:03 2002
@@ -180,6 +180,7 @@
 void	rip_init(void);
 void	rip_input(struct mbuf *, int, int);
 int	rip_output(struct mbuf *, struct socket *, u_long);
+void	gre_input(struct mbuf *, int, int);
 void	ipip_input(struct mbuf *, int, int);
 void	rsvp_input(struct mbuf *, int, int);
 int	ip_rsvp_init(struct socket *);