diff --git a/Makefile b/Makefile
index 04f90e4972..bc3837f065 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,7 @@ STORED_VERSION=$(shell cat $(STORED_VERSION_FILE) 2>/dev/null)
 ifneq ($(STORED_VERSION),)
   FORGEJO_VERSION ?= $(STORED_VERSION)
 else
-  FORGEJO_VERSION ?= v7.0.0-dev-1281-gffe2962dfa+${GITEA_COMPATIBILITY}
+  FORGEJO_VERSION ?= $(shell git describe --exclude '*-test' --tags --always | sed 's/^v//')+${GITEA_COMPATIBILITY}
 endif
 FORGEJO_VERSION_MAJOR=$(shell echo $(FORGEJO_VERSION) | sed -e 's/\..*//')