diff --git a/protocols/grpc/BUCK b/protocols/grpc/BUCK
new file mode 100644
index 0000000..57ab1a0
--- /dev/null
+++ b/protocols/grpc/BUCK
@@ -0,0 +1,38 @@
+PROTOBUF_VER = '3.0.2'
+GRPC_VER = '1.3.0'
+
+BUNDLES = [
+    '//protocols/grpc/proto:onos-protocols-grpc-proto',
+    '//protocols/grpc/api:onos-protocols-grpc-api',
+    '//protocols/grpc/ctl:onos-protocols-grpc-ctl',
+    # gRPC dependencies
+    '//incubator/grpc-dependencies:grpc-core-repkg-1.3.0',
+    '//lib:grpc-protobuf-1.3.0',
+    '//lib:grpc-protobuf-lite-1.3.0',
+    '//lib:grpc-stub-1.3.0',
+    '//lib:grpc-netty-1.3.0',
+    '//lib:grpc-auth-1.3.0',
+    '//lib:google-instrumentation-0.3.0',
+    '//lib:protobuf-java-3.0.2',
+    # Lazily adding all netty-related packages.
+    # Some of them might not be necessary.
+    '//lib:netty',
+    '//lib:netty-buffer',
+    '//lib:netty-codec',
+    '//lib:netty-codec-http',
+    '//lib:netty-codec-http2',
+    '//lib:netty-common',
+    '//lib:netty-handler',
+    '//lib:netty-transport',
+    '//lib:netty-transport-native-epoll',
+    '//lib:netty-resolver',
+]
+
+onos_app (
+    app_name = 'org.onosproject.protocols.grpc',
+    title = 'gRPC Protocol Subsystem',
+    category = 'Protocols',
+    url = 'http://onosproject.org',
+    description = 'ONOS gRPC protocol subsystem',
+    included_bundles = BUNDLES,
+)
\ No newline at end of file
diff --git a/protocols/grpc/ctl/BUCK b/protocols/grpc/ctl/BUCK
index d6cab68..ad855fd 100644
--- a/protocols/grpc/ctl/BUCK
+++ b/protocols/grpc/ctl/BUCK
@@ -1,4 +1,4 @@
-PROTOC_VER = '3.0.2'
+PROTOBUF_VER = '3.0.2'
 GRPC_VER = '1.3.0'
 
 COMPILE_DEPS = [
@@ -7,7 +7,7 @@
     '//protocols/grpc/proto:onos-protocols-grpc-proto',
     '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
     '//lib:grpc-stub-' + GRPC_VER,
-    '//lib:protobuf-java-' + PROTOC_VER,
+    '//lib:protobuf-java-' + PROTOBUF_VER,
 ]
 
 osgi_jar (
diff --git a/protocols/grpc/proto/BUCK b/protocols/grpc/proto/BUCK
index f4a4033..f0df65d 100644
--- a/protocols/grpc/proto/BUCK
+++ b/protocols/grpc/proto/BUCK
@@ -2,7 +2,7 @@
     '//bucklets/grpc.bucklet'
 )
 
-PROTOC_VER = '3.0.2'
+PROTOBUF_VER = '3.0.2'
 GRPC_VER = '1.3.0'
 
 COMPILE_DEPS = [
@@ -10,13 +10,13 @@
     '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
     '//lib:grpc-stub-' + GRPC_VER,
     '//lib:grpc-protobuf-' + GRPC_VER,
-    '//lib:protobuf-java-' + PROTOC_VER,
+    '//lib:protobuf-java-' + PROTOBUF_VER,
 ]
 
 grpc_jar(
     proto_match_patterns = ["*.proto"],
     proto_paths = ["$ONOS_ROOT/protocols/grpc/proto/", "$ONOS_ROOT"], #FIXME should not have to include ONOS_ROOT top level here
-    protoc_version = PROTOC_VER,
+    protoc_version = PROTOBUF_VER,
     plugin_version = GRPC_VER,
     deps = COMPILE_DEPS,
 )