diff --git a/Makefile b/Makefile
index ea2c9167f..fdb0f4a96 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,6 @@ BUILDDIR            = docs/build
 REQUIREMENTSTXT     := docs/requirements.txt
 
 # Godoc server options
-GD_GOROOT           ?= /usr/lib/go  # Godoc has trouble with symbolic links, some may need to use /usr/share/go
 GD_PORT             ?= 8080
 
 .PHONY: depend
@@ -143,10 +142,9 @@ docs:
 
 .PHONY: godoc
 godoc:
-	@go get golang.org/x/tools
 	@go install golang.org/x/tools/cmd/godoc
 	@echo "Follow this link to package documentation: http://localhost:${GD_PORT}/pkg/opendev.org/airship/airshipctl/"
-	@godoc -http=":${GD_PORT}" -goroot ${GD_GOROOT}
+	@godoc -http=":${GD_PORT}"
 
 .PHONY: releasenotes
 releasenotes:
diff --git a/go.sum b/go.sum
index 4caa456a2..e0eb12bc3 100644
--- a/go.sum
+++ b/go.sum
@@ -536,6 +536,7 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a h1:mEQZbbaBjWyLNy0tmZmgEuQAR8XOQ3hL8GYi3J/NG64=
 golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=