diff --git a/[refs] b/[refs]
index fdffbabd78e5..5427ed647ba7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22d6a6a018d897c9c77c6af164722926e70108fa
+refs/heads/master: d882421f4e08ddf0a94245cdbe516db260aa6f41
diff --git a/trunk/scripts/setlocalversion b/trunk/scripts/setlocalversion
index a80d6ea8a5bf..1b31da843672 100644
--- a/trunk/scripts/setlocalversion
+++ b/trunk/scripts/setlocalversion
@@ -12,7 +12,7 @@ cd "${1:-.}" || usage
 if head=`git rev-parse --verify 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
-		printf '%s%s' -g `echo "$head" | cut -c1-8`
+	        git describe | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
 	fi
 
 	# Are there uncommitted changes?