diff --git a/main.go b/main.go
index 8c64ac3..6e48d00 100644
--- a/main.go
+++ b/main.go
@@ -14,6 +14,23 @@ type Options struct {
 
 var globalOpts = &Options{}
 
+var (
+	version   = "1.0.0"
+	buildDate = ""
+	commit    = ""
+)
+
+func versionText() string {
+	msg := fmt.Sprintf("%-12s %s", "Version:", version)
+	if buildDate != "" {
+		msg += fmt.Sprintf("\n%-12s %s", "Built on:", buildDate)
+	}
+	if commit != "" {
+		msg += fmt.Sprintf("\n%-12s %s", "Git Commit:", commit)
+	}
+	return msg
+}
+
 func main() {
 	setCmd := NewINIFileSetCmd()
 	getCmd := NewINIFileGetCmd()
@@ -21,6 +38,8 @@ func main() {
 
 	parser := flags.NewParser(globalOpts, flags.HelpFlag|flags.PassDoubleDash)
 
+	parser.LongDescription = versionText()
+
 	parser.AddCommand("set", "INI File Set", "Sets values in a INI file", setCmd)
 	parser.AddCommand("get", "INI FILE Get", "Gets values from a INI file", getCmd)
 	parser.AddCommand("del", "INI FILE Delete", "Deletes values from a INI file", delCmd)
diff --git a/vars.mk b/vars.mk
index c754479..e0f4056 100644
--- a/vars.mk
+++ b/vars.mk
@@ -8,7 +8,7 @@ TOOL_PATH ?= $(BUILD_DIR)/$(TOOL_NAME)
 
 BUILD_DATE := $(shell date -u '+%Y-%m-%d %I:%M:%S UTC' 2> /dev/null)
 GIT_HASH := $(shell git rev-parse HEAD 2> /dev/null)
-LDFLAGS="'main.buildDate=$(BUILD_DATE)' -X main.commit=$(GIT_HASH) -s -w"
+LDFLAGS="-X main.commit=$(GIT_HASH) -X 'main.buildDate=$(BUILD_DATE)' -s -w"
 
 DEBUG ?= 0