diff --git a/_vendor/phantomjs/phantomjs b/_vendor/phantomjs/phantomjs
new file mode 100755
index 00000000000..e249c26674d
Binary files /dev/null and b/_vendor/phantomjs/phantomjs differ
diff --git a/_vendor/phantomjs/render.js b/_vendor/phantomjs/render.js
new file mode 100644
index 00000000000..21c2c018460
--- /dev/null
+++ b/_vendor/phantomjs/render.js
@@ -0,0 +1,32 @@
+var page = require('webpage').create();
+var args = require('system').args;
+var params = {};
+
+args.forEach(function(arg) {
+  var parts = arg.split('=');
+  params[parts[0]] = parts[1];
+});
+
+var usage = "url=<url> png=<filename> width=<width> height=<height>";
+
+if (!params.url || !params.png) {
+  console.log(usage);
+  phantom.exit();
+}
+
+page.viewportSize = {
+  width: '800',
+  height: '400'
+};
+
+page.open(params.url, function (status) {
+  console.log('Loading a web page');
+
+  setTimeout(function() {
+    console.log('rendering panel to ' + params.png);
+
+    page.render(params.png);
+    phantom.exit();
+
+  }, 2000);
+});
diff --git a/backend/components/phantom_renderer.go b/backend/components/phantom_renderer.go
new file mode 100644
index 00000000000..3d165b8fb91
--- /dev/null
+++ b/backend/components/phantom_renderer.go
@@ -0,0 +1,9 @@
+package components
+
+type PhantomRenderer struct {
+	ImagesDir string
+}
+
+func (renderer *PhantomRenderer) Render(url string) {
+
+}
diff --git a/backend/components/phantom_renderer_test.go b/backend/components/phantom_renderer_test.go
new file mode 100644
index 00000000000..dbeabb1a185
--- /dev/null
+++ b/backend/components/phantom_renderer_test.go
@@ -0,0 +1,22 @@
+package components
+
+import (
+	"io/ioutil"
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestPhantomRender(t *testing.T) {
+
+	Convey("Can render url", func() {
+		tempDir, _ := ioutil.TempDir("", "img")
+		renderer := &PhantomRenderer{ImagesDir: tempDir}
+		renderer.Render("http://www.google.com")
+		//So(err, ShouldBeNil)
+
+		//_, err = os.Stat(store.getFilePathForDashboard("hello"))
+		//So(err, ShouldBeNil)
+	})
+
+}
diff --git a/grafana b/grafana
index 91a6ae756f3..f068b2c1d32 160000
--- a/grafana
+++ b/grafana
@@ -1 +1 @@
-Subproject commit 91a6ae756f30744afe82dabbb5caa7f43d6f7e5a
+Subproject commit f068b2c1d32d74af63e0b36aeed4ac0cc2bb8838