diff --git a/cmd/pivnet/commands/pivnet.go b/cmd/pivnet/commands/pivnet.go
index <HASH>..<HASH> 100644
--- a/cmd/pivnet/commands/pivnet.go
+++ b/cmd/pivnet/commands/pivnet.go
@@ -14,7 +14,7 @@ const (
 	printAsJSON  = "json"
 	printAsYAML  = "yaml"
 
-	host = "https://network.pivotal.io"
+	defaultHost = "https://network.pivotal.io"
 )
 
 type PivnetCommand struct {
@@ -51,7 +51,7 @@ func init() {
 	}
 
 	if Pivnet.Host == "" {
-		Pivnet.Host = host
+		Pivnet.Host = defaultHost
 	}
 }
 
diff --git a/cmd/pivnet/main.go b/cmd/pivnet/main.go
index <HASH>..<HASH> 100644
--- a/cmd/pivnet/main.go
+++ b/cmd/pivnet/main.go
@@ -8,9 +8,16 @@ import (
 	"github.com/pivotal-cf-experimental/go-pivnet/cmd/pivnet/version"
 )
 
+var (
+	// buildVersion is deliberately left uninitialized so it can be set at compile-time
+	buildVersion string
+)
+
 func main() {
-	if version.Version == "" {
+	if buildVersion == "" {
 		version.Version = "dev"
+	} else {
+		version.Version = buildVersion
 	}
 
 	parser := flags.NewParser(&commands.Pivnet, flags.HelpFlag)
Inject version into cli correctly.

[#<I>]