diff --git a/contrib/libpcap/pcap/bpf.h b/contrib/libpcap/pcap/bpf.h
--- a/contrib/libpcap/pcap/bpf.h
+++ b/contrib/libpcap/pcap/bpf.h
@@ -74,6 +74,9 @@
 extern "C" {
 #endif
 
+#if defined(__FreeBSD__)
+#include <net/bpf.h>
+#else
 /* BSD style release date */
 #define BPF_RELEASE 199606
 
@@ -252,6 +255,8 @@
  */
 #define BPF_MEMWORDS 16
 
+#endif /* defined(__FreeBSD__) */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/contrib/libpcap/pcap/pcap.h b/contrib/libpcap/pcap/pcap.h
--- a/contrib/libpcap/pcap/pcap.h
+++ b/contrib/libpcap/pcap/pcap.h
@@ -85,7 +85,10 @@
 #endif /* _WIN32/MSDOS/UN*X */
 
 #include <pcap/socket.h>	/* for SOCKET, as the active-mode rpcap APIs use it */
-#include <net/bpf.h>
+
+#ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H
+#include <pcap/bpf.h>
+#endif
 
 #include <stdio.h>