diff --git a/[refs] b/[refs]
index d2ecc45fba04..ea94b4d1abb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99e3a1eb3c22bb671c6f3d22d8244bfc9fad8185
+refs/heads/master: a182ad3d0f858f50bb719a48bb35a013e12366c5
diff --git a/trunk/scripts/setlocalversion b/trunk/scripts/setlocalversion
index 47e75b69a2e9..32c8554f3946 100755
--- a/trunk/scripts/setlocalversion
+++ b/trunk/scripts/setlocalversion
@@ -10,13 +10,12 @@ cd "${1:-.}" || usage
 
 # Check for git and a git repo.
 if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
-	# Do we have an untagged version?
-	if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
-		if tag=`git describe 2>/dev/null`; then
-			echo $tag | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
-		else
-			printf '%s%s' -g $head
-		fi
+	# Do we have an untagged tag?
+	if atag=`git describe 2>/dev/null`; then
+		echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+	# add -g${head}, if there is no usable tag
+	else
+		printf '%s%s' -g $head
 	fi
 
 	# Is this git on svn?