diff --git a/Makefile b/Makefile
index 5e903ed..a8b8b40 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ mail:
 	python3 mail/generate.py
 
 version:
-	python3 version.py git version.go
+	python3 version.py auto version.go
 
 compile:
 	echo "Downloading deps"
diff --git a/version.py b/version.py
index 0b861b5..387e23e 100644
--- a/version.py
+++ b/version.py
@@ -6,6 +6,13 @@ try:
 except IndexError:
     version = "git"
 
+if version == "auto":
+    try:
+        version = subprocess.check_output("git describe --exact-match HEAD".split()).decode("utf-8").rstrip().replace('v', '')
+    except subprocess.CalledProcessError as e:
+        if e.returncode == 128:
+            version = "git"
+
 commit = subprocess.check_output("git rev-parse --short HEAD".split()).decode("utf-8").rstrip()
 
 file = f'package main; const VERSION = "{version}"; const COMMIT = "{commit}";'