diff --git a/build.go b/build.go
index 3dc4f6fe284..57c4f2add5c 100644
--- a/build.go
+++ b/build.go
@@ -216,6 +216,7 @@ func buildFrontend() {
 
 func setup() {
 	runPrint("go", "get", "-v", "github.com/tools/godep")
+	runPrint("go", "get", "-v", "github.com/jordansissel/fpm")
 	runPrint("go", "get", "-v", "github.com/mattn/go-sqlite3")
 	runPrint("go", "install", "-v", "github.com/mattn/go-sqlite3")
 }
diff --git a/conf/sample.ini b/conf/sample.ini
index fa5c43a6e6a..fa39b220fa6 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -1,4 +1,4 @@
-# Sample grafana config
+# Sample grafana config for deb & rpm packages
 # You only need to specify overrides here
 # Defaults are in the /opt/grafana/current/conf/defaults.ini file
 # This file is never ovewritten when upgrading grafana via deb or rpm package
diff --git a/wercker.yml b/wercker.yml
index a70ceec326c..ee729b1ba18 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -9,10 +9,9 @@ build:
     # Workspace
     - setup-go-workspace
     - script:
-        name: install godep
+        name: build setup
         code: |
-          go get -u github.com/tools/godep
-          go install github.com/tools/godep
+          go run build.go setup
     # Build the project
     - script:
         name: build backend