diff --git a/Gruntfile.js b/Gruntfile.js
index 9a0c69b96f9..1f96048746b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -9,7 +9,6 @@ module.exports = function (grunt) {
     genDir: 'public_gen',
     destDir: 'dist',
     tempDir: 'tmp',
-    arch: os.arch(),
     platform: process.platform.replace('win32', 'windows'),
   };
 
@@ -17,6 +16,10 @@ module.exports = function (grunt) {
     config.arch = process.env.hasOwnProperty('ProgramFiles(x86)') ? 'x64' : 'x86';
   }
 
+  config.arch = grunt.option('arch') || os.arch();
+
+  config.phjs = grunt.option('phjsToRelease');
+
   config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
   console.log('Version', config.pkg.version);
 
diff --git a/README.md b/README.md
index 3a5c7dce6d3..98f4b4d3c9d 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ easily the grafana repository you want to build.
 ```bash
 go get github.com/*your_account*/grafana
 mkdir $GOPATH/src/github.com/grafana
-ln -s  github.com/*your_account*/grafana $GOPATH/src/github.com/grafana/grafana
+ln -s  $GOPATH/src/github.com/*your_account*/grafana $GOPATH/src/github.com/grafana/grafana
 ```
 
 ### Building the backend
diff --git a/tasks/options/phantomjs.js b/tasks/options/phantomjs.js
index 4339f9880b6..83a7b502f65 100644
--- a/tasks/options/phantomjs.js
+++ b/tasks/options/phantomjs.js
@@ -1,34 +1,38 @@
-module.exports = function(config,grunt) {
-  'use strict';
-
-  grunt.registerTask('phantomjs', 'Copy phantomjs binary from node', function() {
-
-    var dest = './vendor/phantomjs/phantomjs';
-    var confDir = './node_modules/phantomjs-prebuilt/lib/';
-
-    if (!grunt.file.exists(dest)){
-
-      var m=grunt.file.read(confDir+"location.js")
-      var src=/= \"([^\"]*)\"/.exec(m)[1];
-
-      if (!grunt.file.isPathAbsolute(src)) {
-        src = confDir+src;
-      }
-
-      try {
-        grunt.config('copy.phantom_bin', {
-          src: src,
-          dest: dest,
-          options: { mode: true},
-        });
-        grunt.task.run('copy:phantom_bin');
-      } catch (err) {
-        grunt.verbose.writeln(err);
-        grunt.fail.warn('No working Phantomjs binary available')
-      }
-
-    } else {
-      grunt.log.writeln('Phantomjs already imported from node');
-    }
-  });
-};
+module.exports = function(config,grunt) {
+  'use strict';
+
+  grunt.registerTask('phantomjs', 'Copy phantomjs binary from node', function() {
+
+    var dest = './vendor/phantomjs/phantomjs';
+    var confDir = './node_modules/phantomjs-prebuilt/lib/';
+
+    if (!grunt.file.exists(dest)){
+
+      src = config.phjs
+
+      if (!src){
+        var m=grunt.file.read(confDir+"location.js")
+        var src=/= \"([^\"]*)\"/.exec(m)[1];
+
+        if (!grunt.file.isPathAbsolute(src)) {
+          src = confDir+src;
+        }
+      }
+
+      try {
+        grunt.config('copy.phantom_bin', {
+          src: src,
+          dest: dest,
+          options: { mode: true},
+        });
+        grunt.task.run('copy:phantom_bin');
+      } catch (err) {
+        grunt.verbose.writeln(err);
+        grunt.fail.warn('No working Phantomjs binary available')
+      }
+
+    } else {
+      grunt.log.writeln('Phantomjs already imported from node');
+    }
+  });
+};