diff --git a/providers/bgpcep/BUCK b/providers/bgpcep/BUCK
new file mode 100644
index 0000000..decfdbe
--- /dev/null
+++ b/providers/bgpcep/BUCK
@@ -0,0 +1,26 @@
+BUNDLES = [
+  '//protocols/bgp/bgpio:onos-protocols-bgp-bgpio',
+  '//protocols/bgp/api:onos-protocols-bgp-api',
+  '//protocols/bgp/ctl:onos-protocols-bgp-ctl',
+  '//protocols/pcep/pcepio:onos-protocols-pcep-pcepio',
+  '//apps/pcep-api:onos-apps-pcep-api',
+  '//protocols/pcep/api:onos-protocols-pcep-api',
+  '//providers/bgp/topology:onos-providers-bgp-topology',
+  '//providers/bgp/cfg:onos-providers-bgp-cfg',
+  '//protocols/pcep/ctl:onos-protocols-pcep-ctl',
+  '//providers/pcep/topology:onos-providers-pcep-topology',
+  '//providers/pcep/tunnel:onos-providers-pcep-tunnel',
+  '//providers/pcep/packet:onos-providers-pcep-packet',
+  '//providers/bgpcep/flow:onos-providers-bgpcep-flow',
+  '//apps/pce/app:onos-apps-pce-app',
+  '//apps/pce/pceweb:onos-apps-pce-pceweb',
+]
+
+onos_app (
+    title = 'BGPCEP Provider',
+    category = 'Provider',
+    url = 'http://onosproject.org',
+    included_bundles = BUNDLES,
+    description = 'BGPCEP providers.',
+)
+
diff --git a/providers/bgpcep/flow/BUCK b/providers/bgpcep/flow/BUCK
index b3468de..d7ee5a1 100644
--- a/providers/bgpcep/flow/BUCK
+++ b/providers/bgpcep/flow/BUCK
@@ -1,18 +1,12 @@
-# FIXME - BGCEP got moved
+COMPILE_DEPS = [
+  '//lib:CORE_DEPS',
+  '//lib:org.osgi.compendium',
+  '//protocols/bgp/api:onos-protocols-bgp-api',
+  '//incubator/api:onos-incubator-api',
+  '//protocols/pcep/api:onos-protocols-pcep-api',
+  '//protocols/pcep/pcepio:onos-protocols-pcep-pcepio',
+]
 
-#SRC = 'src/main/java/org/onosproject/**/'
-
-#CURRENT_NAME = 'onos-bgpcep-provider-flow'
-#CURRENT_TARGET = ':' + CURRENT_NAME
-
-#COMPILE_DEPS = [
-#    '//lib:CORE_DEPS',
-#    '//protocols/bgp/api:onos-bgp-api',
-#]
-
-#osgi_jar(
-#    name = CURRENT_NAME,
-#    srcs = glob([SRC + '/*.java']),
-#    deps = COMPILE_DEPS,
-#    visibility = ['PUBLIC'],
-#)
+osgi_jar_with_tests(
+    deps = COMPILE_DEPS,
+)