diff --git a/update_mirror.sh b/update_mirror.sh
index 094d9f3c752c749e241b501531a79bdcbee883ea..0dae45cb6d5b5fcc765415ff8eea1fc82f73705e 100755
--- a/update_mirror.sh
+++ b/update_mirror.sh
@@ -37,11 +37,11 @@ if git config --get svn-remote.svn.url &> /dev/null;then
   git svn fetch
   git svn rebase
   git for-each-ref --format="%(objectname:short) %(refname)" refs/remotes/tags |  while read ref; do
-    objectname=$(echo ${ref} | cut -d " " -f 1)
-    tagname=$(echo ${ref} | cut -d " " -f 2 | cut -d / -f 4)
-    if ! git show-ref --tags | grep -E -q "refs/tags/${tagname}$"; then
+    tagname="${ref##*/}"
+    if ! git show-ref --tags | grep -q "refs/tags/${tagname}$"; then
       echo "Tag does not exist... creating it"
-      GIT_COMMITTER_DATE="$(git show --format=%aD  | head -1)" git tag -a ${tagname} -m "import '${tagname}' tag from svn" ${objectname}
+      objectname="${ref%% *}"
+      GIT_COMMITTER_DATE="$(git show --format=%aD  | head -1)" git tag -a "${tagname}" -m "import '${tagname}' tag from svn" "${objectname}"
     fi
   done