--- support/ethertalk/bpfiltp.c.orig	Tue Jan 14 11:15:34 1997
+++ support/ethertalk/bpfiltp.c	Tue Jan 14 13:18:36 1997
@@ -41,6 +41,14 @@
 #include <net/if.h>
 #include <net/bpf.h>
 #include <netinet/in.h>
+#ifdef __FreeBSD__
+#if __FreeBSD__ >= 2
+#include <osreldate.h>
+#endif
+#if __FreeBSD_version >= 300000
+#include <net/if_var.h>
+#endif
+#endif /*__FreeBSD__*/
 #include <netinet/if_ether.h>
 #include <netdb.h>
 #include <ctype.h>
@@ -785,7 +793,7 @@
 
   bcopy(eaddr, &eh.ether_dhost, 6);
 #ifdef PHASE2
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && __FreeBSD_version <= 199607
   /* This should really be fixed in the kernel. */
   eh.ether_type = buflen;
 #else
@@ -806,7 +814,7 @@
   *q++ = (eph->protocol >> 8) & 0xff;
   *q++ = (eph->protocol & 0xff);
 #else  PHASE2
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && __FreeBSD_version <= 199607
   /* This should really be fixed in the kernel. */
   eh.ether_type = eph->protocol;
 #else