diff --git a/[refs] b/[refs]
index f29c4d556f6e..6d913d9698d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 167d6a02c1dbdd84d49e87df7718f18fa31cb971
+refs/heads/master: ff80aa97c9b4aae9449a608fe1bc3e7b5121cd66
diff --git a/trunk/scripts/setlocalversion b/trunk/scripts/setlocalversion
index 81d984b91594..f6946cf99ce1 100755
--- a/trunk/scripts/setlocalversion
+++ b/trunk/scripts/setlocalversion
@@ -19,6 +19,11 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
 		fi
 	fi
 
+	# Is this git on svn?
+	if git config --get svn-remote.svn.url >/dev/null; then
+	        printf -- '-svn%s' "`git-svn find-rev $head`"
+	fi
+
 	# Are there uncommitted changes?
 	git update-index --refresh --unmerged > /dev/null
 	if git diff-index --name-only HEAD | grep -v "^scripts/package" \