diff --git a/drivers/bmv2/BUCK b/drivers/bmv2/BUCK
index 9c27e09..312020f 100644
--- a/drivers/bmv2/BUCK
+++ b/drivers/bmv2/BUCK
@@ -1,43 +1,44 @@
-GRPC_VER = '1.3.1'
-
-COMPILE_DEPS = [
-    '//lib:CORE_DEPS',
-    '//lib:minimal-json',
-    '//lib:KRYO',
-    '//lib:JACKSON',
-    '//lib:libthrift',
-    '//protocols/p4runtime/api:onos-protocols-p4runtime-api',
-    '//protocols/p4runtime/model:onos-protocols-p4runtime-model',
-    '//protocols/bmv2/thrift-api:onos-protocols-bmv2-thrift-api',
-    '//drivers/p4runtime:onos-drivers-p4runtime',
-    '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
-    '//lib:grpc-netty-' + GRPC_VER,
-    '//pipelines/basic:onos-pipelines-basic',
-    '//core/store/serializers:onos-core-serializers',
-]
-
-BUNDLES = [
-    ':onos-drivers-bmv2',
-    '//lib:libthrift',
-    '//protocols/bmv2/thrift-api:onos-protocols-bmv2-thrift-api',
-]
-
-osgi_jar(
-    deps = COMPILE_DEPS,
-    resources_root = 'src/main/resources',
-    resources = glob(['src/main/resources/**']),
-)
-
-onos_app (
-    app_name = 'org.onosproject.drivers.bmv2',
-    title = 'BMv2 Drivers',
-    category = 'Drivers',
-    url = 'http://onosproject.org',
-    description = 'Adds support for BMv2 P4 devices.',
-    included_bundles = BUNDLES,
-    required_apps = [
-        'org.onosproject.drivers.p4runtime',
-        'org.onosproject.drivers.gnmi',
-        'org.onosproject.pipelines.basic',
-    ],
-)
+# Buck build of P4-related modules is no longer supported, please use Bazel
+# GRPC_VER = '1.3.1'
+#
+# COMPILE_DEPS = [
+#     '//lib:CORE_DEPS',
+#     '//lib:minimal-json',
+#     '//lib:KRYO',
+#     '//lib:JACKSON',
+#     '//lib:libthrift',
+#     '//protocols/p4runtime/api:onos-protocols-p4runtime-api',
+#     '//protocols/p4runtime/model:onos-protocols-p4runtime-model',
+#     '//protocols/bmv2/thrift-api:onos-protocols-bmv2-thrift-api',
+#     '//drivers/p4runtime:onos-drivers-p4runtime',
+#     '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
+#     '//lib:grpc-netty-' + GRPC_VER,
+#     '//pipelines/basic:onos-pipelines-basic',
+#     '//core/store/serializers:onos-core-serializers',
+# ]
+#
+# BUNDLES = [
+#     ':onos-drivers-bmv2',
+#     '//lib:libthrift',
+#     '//protocols/bmv2/thrift-api:onos-protocols-bmv2-thrift-api',
+# ]
+#
+# osgi_jar(
+#     deps = COMPILE_DEPS,
+#     resources_root = 'src/main/resources',
+#     resources = glob(['src/main/resources/**']),
+# )
+#
+# onos_app (
+#     app_name = 'org.onosproject.drivers.bmv2',
+#     title = 'BMv2 Drivers',
+#     category = 'Drivers',
+#     url = 'http://onosproject.org',
+#     description = 'Adds support for BMv2 P4 devices.',
+#     included_bundles = BUNDLES,
+#     required_apps = [
+#         'org.onosproject.drivers.p4runtime',
+#         'org.onosproject.drivers.gnmi',
+#         'org.onosproject.pipelines.basic',
+#     ],
+# )
diff --git a/lib/BUCK b/lib/BUCK
index a97e1fc..54ca1a9 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Thu, 30 Aug 2018 21:03:24 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Wed, 5 Sep 2018 05:26:42 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -1401,10 +1401,10 @@
 
 remote_jar (
   name = 'libthrift',
-  out = 'libthrift-0.9.3.jar',
-  url = 'mvn:org.apache.thrift:libthrift:jar:0.9.3',
-  sha1 = '8625e8f9b6f49b881fa5fd143172c2833df1ce47',
-  maven_coords = 'org.apache.thrift:libthrift:0.9.3',
+  out = 'libthrift-0.11.0.jar',
+  url = 'mvn:org.apache.thrift:libthrift:jar:0.11.0',
+  sha1 = '4f4f1c1fbbae63258625dea71007fa41bee7edb3',
+  maven_coords = 'org.apache.thrift:libthrift:0.11.0',
   visibility = [ 'PUBLIC' ],
 )
 
diff --git a/lib/deps.json b/lib/deps.json
index fb65b05..dee485d 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -271,7 +271,7 @@
     "apache-karaf-patches": "http://repo1.maven.org/maven2/org/onosproject/onos-apache-karaf-patches/3.0.8/onos-apache-karaf-patches-3.0.8.tar.gz",
     "bndlib": "mvn:biz.aQute.bnd:biz.aQute.bndlib:jar:3.1.0",
     "bndexe": "mvn:biz.aQute.bnd:biz.aQute.bnd:3.1.0",
-    "libthrift": "mvn:org.apache.thrift:libthrift:0.9.3",
+    "libthrift": "mvn:org.apache.thrift:libthrift:0.11.0",
     "qdox": "mvn:com.thoughtworks.qdox:qdox:2.0-M3",
     "org.apache.felix.scr.bnd": {
       "uri": "mvn:org.onosproject:org.apache.felix.scr.bnd:1.4.1-SNAPSHOT",
diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl
index e58bef0..5df2a56 100644
--- a/tools/build/bazel/generate_workspace.bzl
+++ b/tools/build/bazel/generate_workspace.bzl
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Thu, 30 Aug 2018 21:03:22 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Wed, 5 Sep 2018 05:26:36 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -926,8 +926,8 @@
 
     native.maven_jar(
         name = "libthrift",
-        artifact = "org.apache.thrift:libthrift:0.9.3",
-        sha1 = "8625e8f9b6f49b881fa5fd143172c2833df1ce47",
+        artifact = "org.apache.thrift:libthrift:0.11.0",
+        sha1 = "4f4f1c1fbbae63258625dea71007fa41bee7edb3",
     )
 
     native.maven_jar(
@@ -2631,7 +2631,7 @@
 artifact_map["@apache_karaf_patches//jar"] = "http://repo1.maven.org/maven2/org/onosproject/onos-apache-karaf-patches/3.0.8/onos-apache-karaf-patches-3.0.8.tar.gz"
 artifact_map["@bndlib//jar"] = "mvn:biz.aQute.bnd:biz.aQute.bndlib:jar:3.1.0"
 artifact_map["@bndexe//jar"] = "mvn:biz.aQute.bnd:biz.aQute.bnd:jar:3.1.0"
-artifact_map["@libthrift//jar"] = "mvn:org.apache.thrift:libthrift:jar:0.9.3"
+artifact_map["@libthrift//jar"] = "mvn:org.apache.thrift:libthrift:jar:0.11.0"
 artifact_map["@qdox//jar"] = "mvn:com.thoughtworks.qdox:qdox:jar:NON-OSGI:2.0-M3"
 artifact_map["@org_apache_felix_scr_bnd//jar"] = "https://oss.sonatype.org/content/repositories/snapshots/org/onosproject/org.apache.felix.scr.bnd/1.4.1-SNAPSHOT/org.apache.felix.scr.bnd-1.4.1-20160328.235003-2.jar"
 artifact_map["@snmp_core//jar"] = "mvn:org.onosproject:snmp-core:jar:1.3-20161021.1"