diff --git a/apps/kafka-integration/BUILD b/apps/kafka-integration/BUILD
new file mode 100644
index 0000000..e3d3ee5
--- /dev/null
+++ b/apps/kafka-integration/BUILD
@@ -0,0 +1,19 @@
+# FIXME: Work in progress
+
+BUNDLES = [
+    "@kafka-clients//jar",
+    "@protobuf-java-3.2.0//jar",
+    "//incubator/protobuf/models:onos-incubator-protobuf-models",
+    "//incubator/protobuf/models:onos-incubator-protobuf-models-proto",
+    "//apps/kafka-integration/api:onos-apps-kafka-integration-api",
+    "//apps/kafka-integration/app:onos-apps-kafka-integration-app",
+]
+
+onos_app (
+  title = "Kafka Integration",
+  category = "Integration",
+  url = "http://onosproject.org",
+  description = "Provides integration of ONOS and Kafka message bus so that internal ONOS events " +
+    "can be broadcast over the Kafka message bus to off-platform applications.",
+  included_bundles = BUNDLES,
+)
diff --git a/apps/kafka-integration/api/BUILD b/apps/kafka-integration/api/BUILD
new file mode 100644
index 0000000..e7bd18b
--- /dev/null
+++ b/apps/kafka-integration/api/BUILD
@@ -0,0 +1,7 @@
+COMPILE_DEPS = CORE_DEPS + [
+    "@kafka_clients//jar",
+]
+
+osgi_jar_with_tests (
+    deps = COMPILE_DEPS,
+)
\ No newline at end of file
diff --git a/apps/kafka-integration/app/BUILD b/apps/kafka-integration/app/BUILD
new file mode 100644
index 0000000..def2e07
--- /dev/null
+++ b/apps/kafka-integration/app/BUILD
@@ -0,0 +1,21 @@
+# FIXME: Work in progress
+
+COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + CLI + [
+    "//apps/kafka-integration/api:onos-apps-kafka-integration-api",
+    "//core/store/serializers:onos-core-serializers",
+    "@kafka_clients//jar",
+    "@protobuf-java-3.2.0//jar",
+    "//lib:GRPC_1.3",
+    "//incubator/protobuf/models:onos-incubator-protobuf-models",
+    "//incubator/protobuf/models:onos-incubator-protobuf-models-proto",
+]
+
+osgi_jar_with_tests (
+    deps = COMPILE_DEPS,
+    test_deps = TEST_ADAPTERS,
+    web_context = "/onos/kafka-integration",
+    api_title = "Kafka Integration",
+    api_version = "1.0",
+    api_description = "REST API for Kafka Integration",
+    api_package = "org.onosproject.kafkaintegration.rest",
+)
diff --git a/modules.bzl b/modules.bzl
index b0deb36..4ced3f0 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -294,7 +294,7 @@
     "//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr",
     "//apps/vtn/vtnweb:onos-apps-vtn-vtnweb",
     #   '//apps/p4runtime-test:onos-apps-p4runtime-test',
-    #"//apps/kafka-integration/api:onos-apps-kafka-integration-api",
+    "//apps/kafka-integration/api:onos-apps-kafka-integration-api",
     #"//apps/kafka-integration/app:onos-apps-kafka-integration-app",
 ]