diff --git a/cmd/chronograf/main.go b/cmd/chronograf/main.go
index e875990da5..8f167c3b33 100644
--- a/cmd/chronograf/main.go
+++ b/cmd/chronograf/main.go
@@ -36,6 +36,11 @@ func main() {
 		os.Exit(code)
 	}
 
+	if srv.ShowVersion {
+		log.Printf("Chronograf %s (git: %s)\n", Version, Commit)
+		os.Exit(0)
+	}
+
 	if err := srv.Serve(); err != nil {
 		log.Fatalln(err)
 	}
diff --git a/server/server.go b/server/server.go
index 5f806eda47..36f2697221 100644
--- a/server/server.go
+++ b/server/server.go
@@ -40,7 +40,8 @@ type Server struct {
 	ReportingDisabled  bool   `short:"r" long:"reporting-disabled" description:"Disable reporting of usage stats (os,arch,version,cluster_id) once every 24hr" env:"REPORTING_DISABLED"`
 	LogLevel           string `short:"l" long:"log-level" value-name:"choice" choice:"debug" choice:"info" choice:"warn" choice:"error" choice:"fatal" choice:"panic" default:"info" description:"Set the logging level" env:"LOG_LEVEL"`
 
-	BuildInfo BuildInfo
+	ShowVersion bool `short:"v" long:"version" description:"Show Chronograf version info"`
+	BuildInfo   BuildInfo
 
 	Listener net.Listener
 	handler  http.Handler