diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile
index 1e6c8f21ef23..82bc87f5ad7f 100644
--- a/sysutils/osquery/Makefile
+++ b/sysutils/osquery/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	osquery
-PORTVERSION=	2.7.0
-PORTREVISION=	2
+PORTVERSION=	2.8.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	zi@FreeBSD.org
@@ -67,9 +66,9 @@ LLDPD_CONFIGURE_ENV_OFF=SKIP_LLDPD=1
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1100000
-BUILD_DEPENDS+=	clang38:devel/llvm38
-CC=	clang38
-CXX=	clang++38
+BUILD_DEPENDS+=	clang40:devel/llvm40
+CC=	clang40
+CXX=	clang++40
 .endif
 
 post-patch:
diff --git a/sysutils/osquery/distinfo b/sysutils/osquery/distinfo
index 1a522df1e6b6..9a08f8c4076d 100644
--- a/sysutils/osquery/distinfo
+++ b/sysutils/osquery/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1504120429
-SHA256 (facebook-osquery-2.7.0_GH0.tar.gz) = ce5fb4e6000904e998ca4cc9aae2c4125505d6b11e5f0c318456ee9ded8cc2dc
-SIZE (facebook-osquery-2.7.0_GH0.tar.gz) = 973435
-SHA256 (osquery-third-party-2.7.0_GH0.tar.gz) = 264070dbe55e1cb3dd94b263b9110b863963cbde9363a08f49d7a27b2aa9e5f1
-SIZE (osquery-third-party-2.7.0_GH0.tar.gz) = 3264470
+TIMESTAMP = 1506029964
+SHA256 (facebook-osquery-2.8.0_GH0.tar.gz) = 2ebb8c513e684a29f5bad0b95ffbc00cc063514566ae15a62e3c3928cfa51dc5
+SIZE (facebook-osquery-2.8.0_GH0.tar.gz) = 994679
+SHA256 (osquery-third-party-2.8.0_GH0.tar.gz) = cbfb9a2bde1c8b8e53566f7dd7599bc6b91910e657c5efcff8ebb212f2ea5830
+SIZE (osquery-third-party-2.8.0_GH0.tar.gz) = 3264454
diff --git a/sysutils/osquery/files/patch-2f60dd0fd3ef5df9d19368c0d17d96990d088d1a b/sysutils/osquery/files/patch-2f60dd0fd3ef5df9d19368c0d17d96990d088d1a
deleted file mode 100644
index 5bd5ca6e6d83..000000000000
--- a/sysutils/osquery/files/patch-2f60dd0fd3ef5df9d19368c0d17d96990d088d1a
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/osquery/tables/networking/freebsd/routes.cpp b/osquery/tables/networking/freebsd/routes.cpp
-index 991564caf..fd7a878fa 100644
---- osquery/tables/networking/freebsd/routes.cpp
-+++ osquery/tables/networking/freebsd/routes.cpp
-@@ -18,7 +18,6 @@
- 
- #include <arpa/inet.h>
- #include <net/if_dl.h>
--#include <net/route.h>
- #include <sys/sysctl.h>
- 
- #include <boost/algorithm/string/trim.hpp>
-@@ -27,6 +26,9 @@
- #include <osquery/logger.h>
- #include <osquery/tables.h>
- 
-+// Include belongs here to fix build on older fbsds.
-+#include <net/route.h>
-+
- #include "osquery/tables/networking/utils.h"
- 
- namespace osquery {
diff --git a/sysutils/osquery/pkg-plist b/sysutils/osquery/pkg-plist
index 7b4e7573ad7b..3da64cb65b59 100644
--- a/sysutils/osquery/pkg-plist
+++ b/sysutils/osquery/pkg-plist
@@ -13,6 +13,7 @@ include/osquery/filesystem.h
 include/osquery/flags.h
 include/osquery/logger.h
 include/osquery/packs.h
+include/osquery/posix/system.h
 include/osquery/registry.h
 include/osquery/sdk.h
 include/osquery/sql.h
@@ -20,6 +21,7 @@ include/osquery/status.h
 include/osquery/system.h
 include/osquery/tables.h
 include/osquery/query.h
+include/osquery/windows/system.h
 lib/libosquery.a
 sbin/osqueryd
 @sample etc/osquery.conf.sample