diff --git a/c++-rename-class-and-file b/c++-rename-class-and-file
index 714dde9..ec40c89 100755
--- a/c++-rename-class-and-file
+++ b/c++-rename-class-and-file
@@ -1,56 +1,90 @@
 #!/bin/sh
 
 oldname=$1
 newname=$2
 
 if [ $# != 2 ]; then
     echo "Usage: $0 old_classname new_classname"
     exit 1
 fi
 
 oldfile=`echo $oldname | tr A-Z a-z`
 newfile=`echo $newname | tr A-Z a-z`
 
+findup() {
+  parg="$1"
+  _hit=""
+  spwd="$PWD"
+  if test -z "$parg"; then return 1; fi
+
+  while ! test -e "$parg"; do
+   cd ..
+   if test "$PWD" = "/"; then
+     cd "$spwd"
+     return 1
+   fi
+  done
+  _hit="$PWD/$parg"
+  cd "$spwd"
+}
+
+my_mv() {
+  _src="$1"
+  _dest="$2"
+  findup .svn
+  if test -n "$_hit"; then
+      svn mv "$_src" "$_dest" || mv "$_src" "$_dest"
+      return
+  fi
+  findup .git
+  if test -n "$_hit"; then
+      git mv "$_src" "$_dest" || mv "$_src" "$_dest"
+      return
+  fi
+  mv "$_src" "$_dest"
+}
+
+
 if [ ! -f $newfile.h ]; then
     if [ -f ${oldfile}.h ]; then
-        git mv $oldfile.h $newfile.h
+        my_mv $oldfile.h $newfile.h
     fi
-    git mv $oldfile.cpp $newfile.cpp
+    my_mv $oldfile.cpp $newfile.cpp
     if [ -f ${oldfile}_p.h ]; then
-        git mv ${oldfile}_p.h ${newfile}_p.h
+        my_mv ${oldfile}_p.h ${newfile}_p.h
     fi
 fi
 
 # Update buildsystem
 if test -f CMakeLists.txt; then
     buildsystemfile=CMakeLists.txt
 else
     buildsystemfile=`ls -1 *.pro 2>/dev/null | head -n 1`
 fi
 if test -n "$buildsystemfile"; then
     perl -pi -e "s/\b$oldfile\.cpp/$newfile.cpp/;s/\b$oldfile\.h/$newfile\.h/" $buildsystemfile
 fi
 
 # Rename class
 if [ -f ${newfile}.h ]; then
     perl -pi -e "s/$oldname/$newname/g" ${newfile}.h
 fi
 perl -pi -e "s/$oldname/$newname/g" $newfile.cpp
 if [ -f ${newfile}_p.h ]; then
     perl -pi -e "s/$oldname/$newname/g" ${newfile}_p.h
 fi
 
 oldinclguard=`echo $oldname | tr a-z A-Z`
 newinclguard=`echo $newname | tr a-z A-Z`
 
 # Update include guard
 if [ -f ${newfile}.h ]; then
     perl -pi -e "s/$oldinclguard/$newinclguard/g" $newfile.h
 fi
 if [ -f ${newfile}_p.h ]; then
     perl -pi -e "s/$oldinclguard/$newinclguard/g" ${newfile}_p.h
 fi
 
 # Update include in cpp file
 perl -pi -e 's/\b'$oldfile'\.h/'$newfile'\.h/;s/\b'$oldfile'_p\.h/'$newfile'_p\.h/' $newfile.cpp