diff --git a/Makefile b/Makefile
index 9a080d3eab1c541f3207afa9b697a15976ed2a92..5185de7b6bbd3d0e2a6bf98745e314ecdd8cba0a 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}