diff --git a/Makefile b/Makefile
index 2ae2f40b..ef0c37af 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ GOARM  ?= 7
 
 all:
 #	GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) go get -t -d -v ./...
-	GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) go build -ldflags "-X main.stratuxBuild=`git log -n 1 --pretty=%H`" main/gen_gdl90.go main/traffic.go main/ry835ai.go main/network.go main/managementinterface.go main/sdr.go
+	GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) go build -ldflags " -X main.stratuxVersion=`git describe --abbrev=0 --tags` -X main.stratuxBuild=`git log -n 1 --pretty=%H`" main/gen_gdl90.go main/traffic.go main/ry835ai.go main/network.go main/managementinterface.go main/sdr.go
 
 test:
 	sh -c true
diff --git a/main/gen_gdl90.go b/main/gen_gdl90.go
index 474e47af..248bc650 100644
--- a/main/gen_gdl90.go
+++ b/main/gen_gdl90.go
@@ -18,7 +18,6 @@ import (
 // http://www.faa.gov/nextgen/programs/adsb/wsa/media/GDL90_Public_ICD_RevA.PDF
 
 const (
-	stratuxVersion      = "v0.3b2"
 	configLocation      = "/etc/stratux.conf"
 	managementAddr      = ":80"
 	debugLog            = "/var/log/stratux.log"
@@ -54,6 +53,7 @@ const (
 )
 
 var stratuxBuild string
+var stratuxVersion string
 
 // CRC16 table generated to use to work with GDL90 messages.
 var Crc16Table [256]uint16