diff --git a/u-boot/tools/setlocalversion b/u-boot/tools/setlocalversion
index 9a23825218..45f54b03c7 100755
--- a/u-boot/tools/setlocalversion
+++ b/u-boot/tools/setlocalversion
@@ -8,15 +8,6 @@ usage() {
 
 cd "${1:-.}" || usage
 
-# Check for git and a git repo.
-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
-	# Do we have an untagged version?
-	if  [ "`git name-rev --tags HEAD`" = "HEAD undefined" ]; then
-		printf '%s%s' -g `echo "$head" | cut -c1-8`
-	fi
-
-	# Are there uncommitted changes?
-	if git diff-files | read dummy; then
-		printf '%s' -dirty
-	fi
+if version=$(git describe --dirty --always --match="ar9331-v*" 2>/dev/null) ; then
+	echo "-$version"
 fi