diff --git a/tools/svnversion.sh b/tools/svnversion.sh
index 8fe9804..7f055eb 100755
--- a/tools/svnversion.sh
+++ b/tools/svnversion.sh
@@ -26,7 +27,7 @@ svnversion_safe() {
 
             # First make sure it is a git repository
             if [ -d "$GITDIR" ]; then
-                OUTPUT=`LANG=C git --git-dir="$GITDIR" svn info 2>/dev/null|grep '^Revision: '|cut -d\  -f2`
+                OUTPUT=`LANG=C git --git-dir="$GITDIR" log|grep 'git-svn-id: .*@'|head -1|cut -d@ -f2|cut -d\  -f1`
                 if [ -z "$OUTPUT" ]; then
                     echo "unknown"
                 else
@@ -44,6 +45,7 @@ svnversion_safe() {
 }
 
 VERSIONFILE=docs/VERSION
+LOCALVERSIONFILE=docs/LOCALVERSION
 if [ -n "$1" ]; then TOP=$1; else TOP=..; fi
 if [ -r $TOP/$VERSIONFILE ]; then SVNVER=`cat $TOP/$VERSIONFILE`; 
 else
@@ -55,5 +57,8 @@ else
     fi
 fi
 VERSION=$SVNVER-`date -u +%y%m%d`
+if [ -r $TOP/$LOCALVERSIONFILE ]; then
+    VERSION="${VERSION}"`cat $TOP/$LOCALVERSIONFILE`
+fi
 echo $VERSION