diff --git a/Makefile b/Makefile
index 0f8268a49..2c38119e4 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ TMHOME = $${TMHOME:-$$HOME/.tendermint}
 all: install test
 
 install: get_vendor_deps
-	@go install ./cmd/tendermint
+	@go install --ldflags '-extldflags "-static"' ./cmd/tendermint
 
 build:
 	go build --ldflags '-extldflags "-static"' \
diff --git a/version/version.go b/version/version.go
index ed7e46d55..8056ac708 100644
--- a/version/version.go
+++ b/version/version.go
@@ -1,7 +1,25 @@
 package version
 
+import (
+	"fmt"
+)
+
 const Maj = "0"
 const Min = "10"
 const Fix = "0"
 
-const Version = Maj + "." + Min + "." + Fix
+var (
+	// The full version string
+	Version = "0.10.0"
+
+	// GitCommit is set with --ldflags "-X main.gitCommit=$(git rev-parse HEAD)"
+	GitCommit string
+)
+
+func init() {
+	Version = fmt.Sprintf("%d.%d.%d", Maj, Min, Fix)
+
+	if GitCommit != "" {
+		Version += "-" + GitCommit[:8]
+	}
+}