diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -248,42 +248,19 @@
 
 if [ -n "$git_cmd" ] ; then
 	git=$($git_cmd rev-parse --verify --short HEAD 2>/dev/null)
-	gitsvn=$($git_cmd svn find-rev $git 2>/dev/null)
-	if [ -n "$gitsvn" ] ; then
-		svn=" r${gitsvn}"
-		git="=${git}"
-	else
-#		Log searches are limited to 10k commits to speed up failures.
-#		We assume that if a tree is more than 10k commits out-of-sync
-#		with FreeBSD, it has forked the the OS and the SVN rev no
-#		longer matters.
-		gitsvn=$($git_cmd log -n 10000 |
-		    grep '^    git-svn-id:' | head -1 | \
-		    sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p')
-		if [ -z "$gitsvn" ] ; then
-			gitsvn=$($git_cmd log -n 10000 --format='format:%N' | \
-			     grep '^svn ' | head -1 | \
-			     sed -n 's/^.*revision=\([0-9][0-9]*\).*$/\1/p')
-		fi
-		if [ -n "$gitsvn" ] ; then
-			svn=" r${gitsvn}"
-			git="+${git}"
-		else
-			git=" ${git}"
-		fi
-	fi
 	git_cnt=$($git_cmd rev-list --count HEAD 2>/dev/null)
 	if [ -n "$git_cnt" ] ; then
-		git="${git}-c${git_cnt}"
+		git="c${git_cnt}-g${git}"
 	fi
 	git_b=$($git_cmd rev-parse --abbrev-ref HEAD)
-	if [ -n "$git_b" ] ; then
-		git="${git}(${git_b})"
+	if [ -n "$git_b" -a "$git_b" != "HEAD" ] ; then
+		git="${git_b}-${git}"
 	fi
 	if git_tree_modified; then
 		git="${git}-dirty"
 		modified=yes
 	fi
+	git=" ${git}"
 fi
 
 if [ -n "$hg_cmd" ] ; then