diff --git a/BUCK b/BUCK
index 825a17c..8359c45 100644
--- a/BUCK
+++ b/BUCK
@@ -93,6 +93,7 @@
     '//apps/iptopology-api:onos-app-iptopology-api',
     '//apps/metrics:onos-app-metrics',
     '//apps/gangliametrics:onos-app-ganglia',
+    '//apps/graphitemetrics:onos-app-graphite',
     '//apps/mfwd:onos-app-mfwd',
     '//apps/mlb:onos-app-mlb',
     '//apps/mobility:onos-app-mobility',
diff --git a/apps/graphitemetrics/BUCK b/apps/graphitemetrics/BUCK
new file mode 100644
index 0000000..01083ca
--- /dev/null
+++ b/apps/graphitemetrics/BUCK
@@ -0,0 +1,31 @@
+SRC = 'src/main/java/org/onosproject/**/'
+TEST = 'src/main/java/org/onosproject/**/'
+
+CURRENT_NAME = 'onos-app-graphite'
+CURRENT_TARGET = ':' + CURRENT_NAME
+
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+    '//lib:gmetric4j',
+    '//lib:metrics-graphite',
+]
+
+TEST_DEPS = [
+    '//lib:TEST',
+]
+
+java_library(
+    name = CURRENT_NAME,
+    srcs = glob([SRC + '/*.java']),
+    deps = COMPILE_DEPS,
+    visibility = ['PUBLIC'],
+)
+
+java_test(
+    name = 'tests',
+    srcs = glob([TEST + '/*.java']),
+    deps = COMPILE_DEPS +
+           TEST_DEPS +
+           [CURRENT_TARGET],
+    source_under_test = [CURRENT_TARGET],
+)
diff --git a/lib/BUCK b/lib/BUCK
index 24d4c3a..76174c4 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -118,8 +118,6 @@
   license = 'Apache2.0',
 )
 
-
-
 maven_jar(
   name = 'jackson-core',
   id = 'com.fasterxml.jackson.core:jackson-core:2.7.0',
@@ -732,6 +730,13 @@
 )
 
 maven_jar(
+  name = 'metrics-graphite',
+  id = 'io.dropwizard.metrics:metrics-graphite:3.1.2',
+  sha1 = '15a68399652c6123fe6e4c82ac4f0749e2eb6583',
+  license = 'Apache2.0',
+)
+
+maven_jar(
   name = 'concurrent-trees',
   id = 'com.googlecode.concurrent-trees:concurrent-trees:2.4.0',
   sha1 = '2e505b78f9216abebbbdf1c3254bf9f4c565ae43',