diff --git a/Makefile b/Makefile
index 9e148fbde51c474aa7fdf37321cf60ece65e24aa..616de5f226e7b9ced512423dda8d26cf06ceb723 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ endif
 
 # Default build string (git branch and commit)
 ifeq (${BUILD_STRING},)
-        BUILD_STRING	:=	$(shell git log -n 1 --pretty=format:"%h")
+        BUILD_STRING	:=	$(shell git describe --always --dirty --tags 2> /dev/null)
 endif
 VERSION_STRING		:=	v${VERSION_MAJOR}.${VERSION_MINOR}(${BUILD_TYPE}):${BUILD_STRING}