diff --git a/.travis.yml b/.travis.yml
index a22a1439..18e9bb19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,12 @@
 language: go
 sudo: false
-before_install:
+install:
+  - export GOPATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace:$GOPATH"
+  - export PATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin:$PATH"
   - go get github.com/mholt/caddy
   - go get github.com/spf13/hugo
   - go get github.com/robfig/cron
   - go install github.com/mholt/caddy
   - go install github.com/robfig/cron
   - go install github.com/spf13/hugo
-install:
-  - export GOPATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace:$GOPATH"
-  - export PATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin:$PATH"
   - go generate
diff --git a/hugo.go b/hugo.go
index 68b5be5a..6afa6c9e 100644
--- a/hugo.go
+++ b/hugo.go
@@ -1,5 +1,5 @@
 //go:generate go get github.com/jteeuwen/go-bindata
-//go:generate go install github.com/jteeuwen/go-bindata
+//go:generate go install github.com/jteeuwen/go-bindata/go-bindata
 //go:generate go-bindata -pkg assets -o assets/assets.go templates/ assets/css/ assets/js/ assets/fonts/
 
 package hugo