diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 8564bedd1a..a3014ca5b6 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -59,7 +59,9 @@ scm_version()
 			# If we are past a tagged commit (like
 			# "v2.6.30-rc5-302-g72357d5"), we pretty print it.
 			if atag="`git describe 2>/dev/null`"; then
-				echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+				echo "$atag" | awk -F- '{printf("-%s", $(NF))}'
+				date=`git log -1 --author='@rock-chips' --date=format:%y%m%d | sed -n '/Date:/p' | awk '{ print "-"$2 }'`
+				printf '%s' $date
 
 			# If we don't have a tag at all we print -g{commitish}.
 			else
@@ -77,6 +79,8 @@ scm_version()
 			printf '%s' -dirty
 		fi
 
+		printf ' \#%s' $USER
+
 		# All done with git
 		return
 	fi